Merge branch 'develop' into feature/OPS-10828-entraid-permissions

.docksal/docksal-local.env

@@ -1 +1,3 @@
 MYSQL_PORT_MAPPING='3380:3306'
+XDEBUG_ENABLED=1
+XDEBUG_MODE=coverage

.docksal/docksal.env

@@ -1,4 +1,4 @@
 DOCKSAL_STACK=default
 DOCROOT=html
 DB_IMAGE="docksal/mariadb:10.6"
-CLI_IMAGE='docksal/cli:php8.2-build'
+CLI_IMAGE='docksal/cli:php8.3-build'

.docksal/etc/mysql/my.cnf

@@ -0,0 +1,2 @@
+[mysqld]
+innodb_force_recovery=0

.docksal/etc/php/php.ini

@@ -1,2 +1 @@
-; Mail settings
-sendmail_path = '/usr/bin/msmtp -t --host=mail --port=1025 --read-envelope-from'
+xdebug.mode=coverage

.github/workflows/run-tests.yml

@@ -137,7 +137,7 @@ jobs:
             docker compose -f tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/sites/default/files /srv/www/html/sites/default/private
             docker compose -f tests/docker-compose.yml exec -T drupal mkdir -p /srv/www/html/build/logs
             docker compose -f tests/docker-compose.yml exec -T drupal chmod -R 777 /srv/www/html/build/logs
-            docker compose -f tests/docker-compose.yml exec -T -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 drupal ./vendor/bin/phpunit --coverage-clover /srv/www/html/build/logs/clover.xml --debug
+            docker compose -f tests/docker-compose.yml exec -T -w /srv/www -e XDEBUG_MODE=coverage -e BROWSERTEST_OUTPUT_DIRECTORY=/srv/www/html/sites/default/files/browser_output -e SIMPLETEST_BASE_URL=http://127.0.0.1 -e DTT_BASE_URL=http://127.0.0.1 drupal ./vendor/bin/phpunit --coverage-clover /srv/www/html/build/logs/clover.xml --debug
             docker cp "$(docker compose -f tests/docker-compose.yml ps -q drupal)":/srv/www/html/build/logs/clover.xml .
         env:
           fail-fast: true

PATCHES/openid_connect_windows_aad-3346603-5.patch

@@ -1,8 +1,8 @@
 diff --git a/src/Plugin/OpenIDConnectClient/WindowsAad.php b/src/Plugin/OpenIDConnectClient/WindowsAad.php
-index 8845843..6431581 100644
+index 88d4853..ac36baf 100644
 --- a/src/Plugin/OpenIDConnectClient/WindowsAad.php
 +++ b/src/Plugin/OpenIDConnectClient/WindowsAad.php
-@@ -318,7 +318,7 @@ as the mapping between Azure AD accounts and Drupal users.<br/>
+@@ -329,7 +329,7 @@ as the mapping between Azure AD accounts and Drupal users.<br/>
        case 2:
          $v2 = str_contains($endpoints['token'], '/oauth2/v2.0/');
          if (!$v2) {

composer.json

@@ -110,6 +110,7 @@
     "prefer-stable": true,
     "config": {
         "bin-dir": "vendor/bin/",
+        "discard-changes": true,
         "sort-packages": true,
         "allow-plugins": {
             "composer/installers": true,

composer.patches.json

@@ -6,8 +6,7 @@
         "drupal/core" : {
             "https://www.drupal.org/project/drupal/issues/3008292": "PATCHES/core--drupal--3008292-image-upload-validators.patch",
             "https://www.drupal.org/project/drupal/issues/3143617": "PATCHES/core--drupal--3143617-pager-parameter.patch",
-            "https://www.drupal.org/project/drupal/issues/3418098": "PATCHES/core--drupal--3418098-php-mailer.patch",
-            "https://www.drupal.org/project/drupal/issues/3467860": "PATCHES/core--drupal--3467860-aggregation.patch"
+            "https://www.drupal.org/project/drupal/issues/3418098": "PATCHES/core--drupal--3418098-php-mailer.patch"
         },
         "drupal/guidelines": {
             "Drupal 10 compatibility": "PATCHES/guidelines-drupal-10-compatibility.patch"

config/core.entity_form_display.node.job.default.yml

@@ -12,12 +12,9 @@ dependencies:
     - field.field.node.job.field_import_hash
     - field.field.node.job.field_job_closing_date
     - field.field.node.job.field_job_experience
-    - field.field.node.job.field_job_tagger_queue_count
     - field.field.node.job.field_job_type
     - field.field.node.job.field_source
     - field.field.node.job.field_theme
-    - field.field.node.job.reliefweb_job_tagger_info
-    - field.field.node.job.reliefweb_job_tagger_status
     - node.type.job
   module:
     - allowed_formats
@@ -190,11 +187,8 @@ hidden:
   created: true
   field_import_guid: true
   field_import_hash: true
-  field_job_tagger_queue_count: true
   langcode: true
   promote: true
-  reliefweb_job_tagger_info: true
-  reliefweb_job_tagger_status: true
   status: true
   sticky: true
   uid: true

config/core.entity_view_display.node.job.default.yml

@@ -12,12 +12,9 @@ dependencies:
     - field.field.node.job.field_import_hash
     - field.field.node.job.field_job_closing_date
     - field.field.node.job.field_job_experience
-    - field.field.node.job.field_job_tagger_queue_count
     - field.field.node.job.field_job_type
     - field.field.node.job.field_source
     - field.field.node.job.field_theme
-    - field.field.node.job.reliefweb_job_tagger_info
-    - field.field.node.job.reliefweb_job_tagger_status
     - node.type.job
   module:
     - datetime
@@ -115,8 +112,5 @@ content:
 hidden:
   field_import_guid: true
   field_import_hash: true
-  field_job_tagger_queue_count: true
   langcode: true
   links: true
-  reliefweb_job_tagger_info: true
-  reliefweb_job_tagger_status: true

config/core.entity_view_display.node.job.teaser.yml

@@ -13,12 +13,9 @@ dependencies:
     - field.field.node.job.field_import_hash
     - field.field.node.job.field_job_closing_date
     - field.field.node.job.field_job_experience
-    - field.field.node.job.field_job_tagger_queue_count
     - field.field.node.job.field_job_type
     - field.field.node.job.field_source
     - field.field.node.job.field_theme
-    - field.field.node.job.reliefweb_job_tagger_info
-    - field.field.node.job.reliefweb_job_tagger_status
     - node.type.job
   module:
     - datetime
@@ -59,10 +56,7 @@ hidden:
   field_import_guid: true
   field_import_hash: true
   field_job_experience: true
-  field_job_tagger_queue_count: true
   field_job_type: true
   field_theme: true
   langcode: true
   links: true
-  reliefweb_job_tagger_info: true
-  reliefweb_job_tagger_status: true

config/core.extension.yml

@@ -60,9 +60,8 @@ module:
   node: 0
   ocha_ai: 0
   ocha_ai_chat: 0
-  ocha_ai_tag: 0
-  ocha_entraid: 0
   ocha_content_classification: 0
+  ocha_entraid: 0
   ocha_monitoring: 0
   openid_connect: 0
   openid_connect_windows_aad: 0
@@ -71,20 +70,19 @@ module:
   path: 0
   path_alias: 0
   redirect: 0
+  reliefweb_ai: 0
   reliefweb_analytics: 0
   reliefweb_api: 0
   reliefweb_bookmarks: 0
   reliefweb_contact: 0
   reliefweb_disaster_map: 0
-  reliefweb_dsr: 0
   reliefweb_entities: 0
   reliefweb_fields: 0
   reliefweb_files: 0
   reliefweb_form: 0
   reliefweb_guidelines: 0
   reliefweb_homepage: 0
   reliefweb_import: 0
-  reliefweb_job_tagger: 0
   reliefweb_meta: 0
   reliefweb_moderation: 0
   reliefweb_reporting: 0

config/filter.format.markdown.yml

@@ -82,4 +82,4 @@ filters:
     status: false
     weight: 0
     settings:
-      replace_empty: '0'
+      replace_empty: 0

config/ocha_content_classification.ocha_classification_workflow.node_job.yml

@@ -16,8 +16,6 @@ fields:
       enabled: true
     field_how_to_apply:
       enabled: false
-    reliefweb_job_tagger_info:
-      enabled: false
   classifiable:
     field_career_categories:
       enabled: true

config/openid_connect.client.entraid.yml

@@ -10,8 +10,10 @@ plugin: windows_aad
 settings:
   client_id: entraid_client_id
   client_secret: entraid_client_secret
+  iss_allowed_domains: ''
   authorization_endpoint_wa: ''
   token_endpoint_wa: ''
+  end_session_endpoint: ''
   userinfo_endpoint_wa: ''
   map_ad_groups_to_roles: false
   group_mapping:
@@ -23,6 +25,4 @@ settings:
   userinfo_update_email: true
   hide_email_address_warning: false
   subject_key: sub
-  end_session_endpoint: ''
-  iss_allowed_domains: ''
   front_channel_logout_url: ''

config/reliefweb_ai.settings.yml

@@ -0,0 +1,8 @@
+_core:
+  default_config_hash: fU8Wp0OCsudl5x0QSV_mUWWt2KbQuzhVwEB-o9A8peg
+ocha_ai_chat:
+  allow_for_anonymous: false
+  instructions_replace: false
+  login_instructions: |
+    <p>The use of <strong>Ask ReliefWeb</strong> requires an account on ReliefWeb.</p>
+    <p>Please <a href="/user/login/hid?destination=@destination" target="_parent">login</a> or <a href="https://auth.humanitarian.id/register" target="_parent">create a new account</a>.</p>