OEL-1026: Fix composer dependencies and update description list pattern.

composer.json

@@ -14,22 +14,28 @@
     },
     "require-dev": {
         "composer/installers": "^1.11",
-        "drupal/core-composer-scaffold": "^8.9 || ^9.2",
-        "drupal/config_devel": "~1.2",
         "drupal/better_exposed_filters": "^5.0",
+        "drupal/config_devel": "~1.2",
+        "drupal/core-composer-scaffold": "^8.9 || ^9.2",
+        "drupal/ctools": "^3.7",
         "drupal/drupal-extension": "~4.1",
+        "drupal/file_link": "^2.0.4",
+        "drupal/pathauto": "^1.8",
+        "drupal/search_api": "^1.21",
+        "drupal/search_api_autocomplete": "^1.5",
         "drush/drush": "^10.3",
-        "openeuropa/code-review": "1.7",
+        "easyrdf/easyrdf": "1.0.0 as 0.9.1",
+        "egulias/email-validator": "^2.1.22 || ^3.0",
+        "openeuropa/code-review": "^1.7 || ^2.0",
         "openeuropa/composer-artifacts": "~0.1",
         "openeuropa/drupal-core-require-dev": "^8.9 || ^9.2",
         "openeuropa/oe_authentication": "^1.4",
         "openeuropa/oe_corporate_blocks": "^4.4",
         "openeuropa/oe_multilingual": "^1.9",
+        "openeuropa/oe_starter_content": "1.x-dev",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0",
         "phpspec/prophecy-phpunit": "^1 || ^2",
-        "easyrdf/easyrdf": "1.0.0 as 0.9.1",
-        "drupal/search_api": "^1.21",
-        "drupal/search_api_autocomplete": "^1.5",
+        "openeuropa/oe_contact_forms": "~1.1",
         "openeuropa/oe_starter_content": "1.x-dev"
     },
     "scripts": {
@@ -62,6 +68,12 @@
                 "web-root": "./build"
             }
         },
+        "_readme": [
+            "Explicit minimum version requirement of drupal/ctools module due to D9.2 compatability.",
+            "Explicit requirement for drupal/file_link due to https://www.drupal.org/project/file_link/issues/3147517. It can be removed when oe_media requires version 2.0.4 or above.",
+            "Explicit requirement for drupal/pathauto due to D9.2 compatability according to https://www.drupal.org/node/2979476.",
+            "Explicit requirement for egulias/email-validator due to https://www.drupal.org/project/drupal/issues/3061074#comment-14300579. It can be removed when Drupal core 9.2 support is droppped."
+        ],
         "installer-paths": {
             "build/core": [
                 "type:drupal-core"
@@ -83,14 +95,6 @@
         }
     },
     "config": {
-        "sort-packages": true,
-        "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true,
-            "cweagans/composer-patches": true,
-            "phpro/grumphp": true,
-            "composer/installers": true,
-            "drupal/core-composer-scaffold": true,
-            "openeuropa/composer-artifacts": true
-        }
+        "sort-packages": true
     }
 }

modules/oe_whitelabel_event/templates/node--oe-event--full.html.twig

@@ -7,17 +7,17 @@
 
 {% set description_items = [
   {
-    term: { 
-      'label': content.oe_event_dates|field_label,
-      'icon': 'calendar-event',
-    },
-    definition: content.oe_event_dates|field_value,
+    term:[{ 
+          'label': content.oe_event_dates|field_label,
+          'icon': 'calendar-event',
+      }],
+      definition: content.oe_event_dates|field_value,
   },
   {
-    term: { 
+    term: [{ 
       'label': content.oe_location|field_label,
       'icon': 'geo-alt-fill',
-    },
+    }],
     definition: content.oe_location|field_value,
   },
 ]%}
@@ -33,10 +33,7 @@
 {% endset %}
 
 {# Set inpage navigation main content attributes #}
-{% if attributes is empty %}
-  {% set attributes = create_attribute() %}
-{% endif %}
-{% set attributes = attributes.addClass(["container", "mt-md-4-75", "mt-4"]) %}
+{% set attributes = attributes.create_attribute.addClass(["container", "mt-md-4-75", "mt-4"]) %}
 
 {# Print event #}
 <article{{attributes}}>