Merge pull request #311 from UN-OCHA/develop

Deploy 16-08-2023
UN-OCHA · Aug 16, 2023 · d6cca99 · d6cca99
2 parents 3facb35 + 00054ad
commit d6cca99
Show file tree

Hide file tree

Showing 194 changed files with 1,544 additions and 4,092 deletions.
diff --git a/.github/workflows/composer-update.yml b/.github/workflows/composer-update.yml
@@ -17,6 +17,5 @@ jobs:
         patch_branch: 'develop'
         patch_packages: 'drupal/*'
         patch_maintainers: ${{ secrets.DRUPAL_MAINTAINERS }}
-        php_version: '8.2'
         slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
         slack_channel_name: ${{ vars.SLACK_CHANNEL }}
diff --git a/PATCHES/core-ckeditor5-dialog-fix-3351600.patch b/PATCHES/core-ckeditor5-dialog-fix-3351600.patch
@@ -0,0 +1,17 @@
+diff --git a/core/modules/ckeditor5/js/ckeditor5.dialog.fix.js b/core/modules/ckeditor5/js/ckeditor5.dialog.fix.js
+index 1f4ed1d7feb523cffee35f245b7dab06da4f38fa..41449dcf693fab7ff15220fd4b57bd89a71cab8d 100644
+--- a/core/modules/ckeditor5/js/ckeditor5.dialog.fix.js
++++ b/core/modules/ckeditor5/js/ckeditor5.dialog.fix.js
+@@ -12,6 +12,12 @@
+     // CKEditor 5 in modals can work as expected.
+     // @see https://api.jqueryui.com/dialog/#method-_allowInteraction
+     _allowInteraction(event) {
++      // Fixes "Uncaught TypeError: event.target.classList is undefined"
++      // in Firefox (only).
++      // @see https://www.drupal.org/project/drupal/issues/3351600
++      if (event.target.classList === undefined) {
++        return this._super(event);
++      }
+       return event.target.classList.contains('ck') || this._super(event);
+     },
+   });
diff --git a/composer.json b/composer.json
@@ -60,6 +60,7 @@
         "drupal/pathauto": "^1.8",
         "drupal/redirect": "^1.8",
         "drupal/samlauth": "^3.8",
+        "drupal/simple_menu_permissions": "^2.0",
         "drupal/social_auth_hid": "^3.2",
         "drupal/stable": "^2.0",
         "drupal/stage_file_proxy": "^2.1",

diff --git a/composer.lock b/composer.lock
diff --git a/composer.patches.json b/composer.patches.json
@@ -1,7 +1,8 @@
 {
   "patches": {
     "drupal/core": {
-      "https://www.drupal.org/project/drupal/issues/3376927": "PATCHES/core-css-js-aggregation-3376927.patch"
+      "https://www.drupal.org/project/drupal/issues/3376927": "PATCHES/core-css-js-aggregation-3376927.patch",
+      "https://www.drupal.org/project/drupal/issues/3351600": "PATCHES/core-ckeditor5-dialog-fix-3351600.patch"
     },
     "drupal/csp": {
       "Simplify log format": "PATCHES/csp-log-format.patch"
@@ -28,9 +29,6 @@
     },
     "drupal/username_enumeration_prevention": {
       "Avoid leaking the path via Drupal.settings json": "PATCHES/username_enumeration_prevention-user-login-block-form-3312288.patch"
-    },
-    "drupal/xmlsitemap": {
-      "https://www.drupal.org/project/xmlsitemap/issues/3323148": "PATCHES/xmlsitemap-d10-compatibility-admin-page.patch"
     }
   }
 }
diff --git a/config/core.entity_form_display.paragraph.news_and_stories.default.yml b/config/core.entity_form_display.paragraph.news_and_stories.default.yml
@@ -13,14 +13,15 @@ bundle: news_and_stories
 mode: default
 content:
   field_news_and_stories_list:
-    type: viewsreference_autocomplete
+    type: viewsreference_select
     weight: 0
     region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
+    settings: {  }
+    third_party_settings: {  }
+  translation:
+    weight: 10
+    region: content
+    settings: {  }
     third_party_settings: {  }
 hidden:
   created: true

diff --git a/config/core.extension.yml b/config/core.extension.yml
@@ -70,6 +70,7 @@ module:
   responsive_image: 0
   samlauth: 0
   serialization: 0
+  simple_menu_permissions: 0
   social_api: 0
   social_auth: 0
   social_auth_hid: 0

diff --git a/config/system.menu.events.yml b/config/system.menu.events.yml
@@ -4,5 +4,5 @@ status: true
 dependencies: {  }
 id: events
 label: Events
-description: ''
+description: 'Footer menu: Events'
 locked: false
diff --git a/config/system.menu.latest.yml b/config/system.menu.latest.yml
@@ -4,5 +4,5 @@ status: true
 dependencies: {  }
 id: latest
 label: Latest
-description: ''
+description: 'Footer menu: Latest menu'
 locked: false
diff --git a/config/system.menu.main.yml b/config/system.menu.main.yml
@@ -6,5 +6,5 @@ _core:
   default_config_hash: Q2Ra3jfoIVk0f3SjxJX61byRQFVBAbpzYDQOiY-kno8
 id: main
 label: 'Main menu'
-description: 'Main menu with mega menu'
+description: 'Main navigation menu'
 locked: true
diff --git a/config/system.menu.our-priorities.yml b/config/system.menu.our-priorities.yml
@@ -4,5 +4,5 @@ status: true
 dependencies: {  }
 id: our-priorities
 label: 'Our priorities'
-description: ''
+description: 'Footer menu: Our priorities'
 locked: false
diff --git a/config/system.menu.take-action.yml b/config/system.menu.take-action.yml
@@ -4,5 +4,5 @@ status: true
 dependencies: {  }
 id: take-action
 label: 'Take action'
-description: ''
+description: 'Footer menu: Take action'
 locked: false
diff --git a/config/system.menu.what-we-do.yml b/config/system.menu.what-we-do.yml
@@ -4,5 +4,5 @@ status: true
 dependencies: {  }
 id: what-we-do
 label: 'What we do'
-description: ''
+description: 'Footer menu: What we do'
 locked: false
diff --git a/config/system.menu.where-we-work.yml b/config/system.menu.where-we-work.yml
@@ -4,5 +4,5 @@ status: true
 dependencies: {  }
 id: where-we-work
 label: 'Where we work'
-description: ''
+description: 'Footer menu: Where we work'
 locked: false