Merge branch release-2.18.11 into main

Author: ws2-release-bot

composer.json

@@ -26,7 +26,7 @@
         "drupal/decorative_image_widget": "1.0.1",
         "drupal/devel": "5.4.0",
         "drupal/devel_kint_extras": "1.1.0",
-        "drupal/editor_advanced_link": "2.2.4",
+        "drupal/editor_advanced_link": "2.3.4",
         "drupal/editoria11y": "2.2.18",
         "drupal/environment_indicator": "4.0.14",
         "drupal/field_group": "3.6.0",

config/install/editor.editor.basic_html.yml

@@ -73,6 +73,7 @@ settings:
         - '<div class>'
     editor_advanced_link_link:
       enabled_attributes:
+        - aria-label
         - class
         - id
         - target

config/install/editor.editor.full_html.yml

@@ -57,6 +57,7 @@ settings:
       allowed_tags: {  }
     editor_advanced_link_link:
       enabled_attributes:
+        - aria-label
         - class
         - id
         - target

config/install/editor.editor.minimal_format.yml

@@ -28,6 +28,7 @@ settings:
       allowed_tags: {  }
     editor_advanced_link_link:
       enabled_attributes:
+        - aria-label
         - class
         - id
         - target

config/install/filter.format.basic_html.yml

@@ -43,7 +43,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<br> <p class="lead"> <h1> <h2 id> <h3 id> <h4 id> <h5 id> <dl> <dt> <dd> <mark> <cite class> <blockquote cite class> <svg title role viewbox class> <path d fill> <button class="uds-tooltip"> <ol class> <drupal-media data-spacing-top data-spacing-bottom data-spacing-left data-spacing-right data-round title data-entity-type data-entity-uuid alt data-view-mode data-caption data-align> <img class src alt height width data-entity-uuid data-entity-type data-caption data-align> <ul class> <strong> <em> <a href title class id target data-entity-type data-entity-uuid data-entity-substitution role name hreflang> <li> <hr class="copy-divider"> <div class> <i class data-fa-transform> <span class data-fa-transform> <section class="simple-box"> <table> <tr rowspan colspan> <td rowspan colspan> <th rowspan colspan class="normal indent"> <thead> <tbody> <tfoot> <caption> <mark class>'
+      allowed_html: '<br> <p class="lead"> <h1> <h2 id> <h3 id> <h4 id> <h5 id> <dl> <dt> <dd> <mark> <cite class> <blockquote cite class> <svg title role viewbox class> <path d fill> <button class="uds-tooltip"> <ol class> <drupal-media data-spacing-top data-spacing-bottom data-spacing-left data-spacing-right data-round title data-entity-type data-entity-uuid alt data-view-mode data-caption data-align> <img class src alt height width data-entity-uuid data-entity-type data-caption data-align> <ul class> <strong> <em> <a aria-label href title class id target data-entity-type data-entity-uuid data-entity-substitution role name hreflang> <li> <hr class="copy-divider"> <div class> <i class data-fa-transform> <span class data-fa-transform> <section class="simple-box"> <table> <tr rowspan colspan> <td rowspan colspan> <th rowspan colspan class="normal indent"> <thead> <tbody> <tfoot> <caption> <mark class>'
       filter_html_help: false
       filter_html_nofollow: false
   filter_html_escape:

config/install/filter.format.minimal_format.yml

@@ -17,7 +17,7 @@ filters:
     status: true
     weight: -10
     settings:
-      allowed_html: '<br> <p> <h2> <h3> <h4> <h5> <h6> <strong> <em> <a href title class id target="_blank">'
+      allowed_html: '<br> <p> <h2> <h3> <h4> <h5> <h6> <strong> <em> <a aria-label href title class id target="_blank">'
       filter_html_help: true
       filter_html_nofollow: false
   filter_url:

config/install/filter.format.restricted_html.yml

@@ -17,7 +17,7 @@ filters:
     status: true
     weight: -10
     settings:
-      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id>'
+      allowed_html: '<a aria-label href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_url:

modules/asu_brand/README.md

@@ -1,99 +1,84 @@
 # ASU Brand module for Drupal
 
 The ASU Brand module provides the following functionality:
-* An ASU branded, accessible, Web Standards compliant Header with integration
+
+- An ASU branded, accessible, Web Standards compliant Header with integration
   with ASU search and spplying required links. The header provides navigation
   menu which you can configure through the Drupal admin user interface. More
   details on configuration below.
-* ASU Universal Google Tag Manager. Enabled and included in your site's markup
+- ASU Universal Google Tag Manager. Enabled and included in your site's markup
   automatically without any configuration needed by you. Should you want to
   turn it off or wish to add an additional GTM container ID, visit Admin ->
   Configuration -> ASU Brand settings.
-* ASU branded Cookie Consent for GDPR compliance. On by default. No
+- ASU branded Cookie Consent for GDPR compliance. On by default. No
   configuration necessary.
 
-Find more technical details about the header, GTM and cookie consent on
-[unity.web.asu.edu](https://unity.web.asu.edu).
+Find more technical details about the header, GTM and cookie consent on [unity.web.asu.edu](https://unity.web.asu.edu).
+
 ## Installation instructions
+
 The ASU Brand module installs when you create a Webspark site. If you're
 using this module outside of Webspark or in other situations, see the
 instructions below.
+
 1. Install and enable the ASU Brand module just like any other module.
 2. Go to the Admin -> Structure -> Blocks and place the ASU Brand header block
    into the header region of your site. Please note that the header supplies
    its own header tag, so you may need to update non-Webspark themes to ensure
    they do not set their own header tags. The available regions will be
    determined by the theme that you are using.
+
 ## CAS integration
+
 The default login/out paths used in the ASU Brand header assume you have the
 CAS single sign on module enabled. CAS should be included and installed by
 default in Webspark sites. If needed for implementations, install and enable
 the CAS module to allow users to create accounts and authenticate to your site.
+
 ## Note on caching
+
 The ASU Brand header is cached for performance. When you make updates to the
 menu used in your header, please clear the cache to see your updates
 immediately. In the Drupal UI, go Admin -> Configuration -> Performance to
 clear the cache.
-## How to configure your header
-Webspark sites install with the ASU header enabled and placed in the site
-layout by default with the Main menu configured as the header menu. Should
-you wish to reconfigure your header, or to add an additional header to your
-site, such as for a subsite or microsite, navigate to Admin -> Structure ->
-Blocks and place an "ASU brand header" block into the header region of your
-site. Each header block you create has its own independent settings. Most sites
-will only ever need one.
-
-Within the ASU brand header block settings, you may change the settings of your
-header, but the defaults should work for most situations.
-### Columns within dropdown menus
-To create a menu column add a menu link at the second level of your menu and
-configure it with the "Heading - starts a column" setting in the "ASU Brand
-menu link type" dropdown. All menu links at the second level following that
-header will be in that column until the next "Heading" menu link is
-encountered and a new column will start.
-### A note on buttons in the menu
-There are three types of buttons available in the menu.
-1. Top level call to action buttons display alongside the top level menu items
-   and are configured in the block configurations.
-2. Buttons within drop down menus' columns are configured on menu link item
-   forms using the "ASU Brand menu link type" dropdown.
-3. Buttons in the tray at the bottom of drop down menus are enabled by clicking
-   a menu link item's "Display as ASU Brand button in dropdown tray" checkbox.
-
-For 2 and 3, enabling the button settings will transform that menu link into
-the corresponding button type ONLY if that menu item is in the second level of
-your menu. If those menu link fields are configured in non-header menus, they
-will be ignored.
-### Header menu depth
-Only header menu links at the top and second level are displayed in the header.
+
 ## Other configurations
+
 Global configurations related to GTM and Cookie Consent are found at the
 following click path: Admin -> Configuration -> ASU Brand settings.
+
 ## Header assets
+
 Previous version of the ASU Brand header loaded the header from external
 sources. The Webspark 2 version of the module, now ships with all header assets
 from the Unity Design System "components-library" header component onboard.
+
 ## A note about toolbar menus
+
 The ASU Brand header is designed to work with the Drupal core toolbar menu used
 to provide administrative system links. A popular Drupal module, the Admin
 Toolbar, which provides dropdown menus from the toolbar, is not currently
 supported.
+
 ## Help! The header overlaps my content or UI!
+
 The ASU Brand header uses fixed positioning, and that can lead to issues with
 other fixed positioned elements in the UI. We've attempted to catch and supply
 CSS rules that make adjustments for those UI elements provided in Webspark. If
 you have customizations or added modules that are overlapped, you can use the
 following CSS to deliver UI adjustments:
 
-```
+```css
 body.asu-brand-header-present {
   /* Your rules here. See css/asu_brand.header.css for examples from this
      module. To see how the ASU Brand module uses Javascript to detect and
      apply necessary changes related to the header, see
      js/asu_brand.header.js */
 }
 ```
+
 ## Extending the Google Analytics dataLayer
+
 The ASU Brand module initializes a Google Analytics dataLayer for use by
 frontend Unity components. The dataLayer has been implmented so that
 modules may take advantage of it as well using the
@@ -103,7 +88,7 @@ the developer implementing to ensure it behaves as desired and doesn't
 interfere with other dataLayer usage on existing pages. If you test this,
 we would appreciate hearing about your experience.
 
-```
+```php
 function hook_asu_brand_gtm_datalayer_alter(array &$datalayer) {
   // Set a "site" variable return.
   $datalayer['site'] = 'My Site';

modules/asu_brand/asu_brand.install

@@ -21,4 +21,37 @@ function asu_brand_update_9002() {
   $config = $config_factory->getEditable('asu_brand.settings');
   $config->clear('asu_brand_cookie_consent_enabled');
   $config->save(TRUE);
-}
+}
+
+/**
+ * Installs dropdown "Column row span" base field storage for menu link content entities.
+ */
+function asu_brand_update_9003() {
+  $entity_definition_update_manager = \Drupal::entityDefinitionUpdateManager();
+  $field_name = 'menu_link_asu_brand_link_dropdown_row_span';
+  $entity_type_id = 'menu_link_content';
+
+  // Skip if field storage already exists.
+  if ($entity_definition_update_manager->getFieldStorageDefinition($field_name, $entity_type_id)) {
+    return;
+  }
+
+  $definition = \Drupal\Core\Field\BaseFieldDefinition::create('integer')
+    ->setLabel('Column row span')
+    ->setDescription('How many columns (max of 5) should appear in this row.')
+    ->setSettings([
+      'min' => 1,
+      'max' => 5,
+    ])
+    ->setSetting('unsigned', TRUE)
+    ->setSetting('size', 'tiny')
+    ->setDefaultValue(1)
+    ->setDisplayOptions('form', ['type' => 'number', 'weight' => 51]);
+
+  $entity_definition_update_manager->installFieldStorageDefinition(
+    $field_name,
+    $entity_type_id,
+    'asu_brand',
+    $definition
+  );
+}

modules/asu_brand/asu_brand.libraries.yml

@@ -1,16 +1,17 @@
 components-library:
-  version: 2.18.10
+  version: 2.18.11
   dependencies:
     - core/drupal
     - core/drupalSettings
+    - asu_react_integration/reactjs
   js:
     node_modules/@asu/component-header-footer/dist/asuHeaderFooter.umd.js: {}
     js/asu_brand.header.js: {}
   css:
     component:
       css/asu_brand.header.css: {}
 block__system_main_block:
-  version: 2.18.10
+  version: 2.18.11
   css:
     theme:
       css/asu-brand-edit-form.css: {}