Merge pull request #545 from chapter-three/deployment/20210915

Deployment/20210915

composer-manifest.yaml

@@ -149,7 +149,7 @@ packages:
     harvesthq/chosen: 1.8.7
     html2text/html2text: 4.0.1
     joachim-n/composer-manifest: 1.0.4
-    judicialcouncil/courtyard-artifact: 0.1.195
+    judicialcouncil/courtyard-artifact: 0.1.202
     kub-at/php-simple-html-dom-parser: 1.9.1
     laminas/laminas-diactoros: 1.8.7p2
     laminas/laminas-escaper: 2.6.1

config/config-default/config_ignore.settings.yml

@@ -1,4 +1,5 @@
 ignored_config_entities:
+  - 'key.key.*'
   - 'webform.webform.*'
   - tmgmt.settings
 _core:

config/config-default/core.entity_form_display.node.srl_howto_instruction.default.yml

@@ -60,7 +60,6 @@ third_party_settings:
     group_hero:
       children:
         - field_parent
-        - field_back_button_only
         - field_title_display
         - field_column_first
         - field_column_second
@@ -99,7 +98,7 @@ third_party_settings:
         - field_watchers
         - field_case_type_override
       parent_name: ''
-      weight: 14
+      weight: 13
       format_type: fieldset
       region: content
       format_settings:
@@ -145,13 +144,6 @@ content:
     third_party_settings: {  }
     type: options_select
     region: content
-  field_back_button_only:
-    weight: 3
-    settings:
-      display_label: true
-    third_party_settings: {  }
-    type: boolean_checkbox
-    region: content
   field_blocks:
     weight: 11
     settings:
@@ -263,7 +255,7 @@ content:
     type: media_library_widget
     region: content
   field_metatag:
-    weight: 13
+    weight: 12
     settings:
       sidebar: true
     third_party_settings: {  }
@@ -326,30 +318,30 @@ content:
     third_party_settings: {  }
   moderation_state:
     type: moderation_state_default
-    weight: 20
+    weight: 19
     settings: {  }
     region: content
     third_party_settings: {  }
   path:
     type: path
-    weight: 10
+    weight: 9
     region: content
     settings: {  }
     third_party_settings: {  }
   publish_on:
     type: datetime_timestamp_no_default
-    weight: 18
+    weight: 17
     region: content
     settings: {  }
     third_party_settings: {  }
   publish_state:
     type: scheduler_moderation
-    weight: 16
+    weight: 15
     region: content
     settings: {  }
     third_party_settings: {  }
   scheduler_settings:
-    weight: 15
+    weight: 14
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -369,13 +361,13 @@ content:
       placeholder: ''
     third_party_settings: {  }
   translation:
-    weight: 12
+    weight: 11
     region: content
     settings: {  }
     third_party_settings: {  }
   uid:
     type: entity_reference_autocomplete
-    weight: 11
+    weight: 10
     settings:
       match_operator: CONTAINS
       size: 60
@@ -385,13 +377,13 @@ content:
     third_party_settings: {  }
   unpublish_on:
     type: datetime_timestamp_no_default
-    weight: 17
+    weight: 16
     region: content
     settings: {  }
     third_party_settings: {  }
   unpublish_state:
     type: scheduler_moderation
-    weight: 19
+    weight: 18
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -401,5 +393,6 @@ content:
     settings: {  }
     third_party_settings: {  }
 hidden:
+  field_back_button_only: true
   promote: true
   sticky: true

config/config-default/filter.format.basic_html.yml

@@ -23,7 +23,7 @@ filters:
     status: true
     weight: -10
     settings:
-      allowed_html: '<em> <strong> <cite> <blockquote cite> <code> <ol type start> <li class="jcc-*"> <dl> <dt> <dd> <h2 id class="usa-* jcc-*"> <h3 id class="usa-* jcc-*"> <h4 id class="usa-* jcc-*"> <h5 id class="usa-* jcc-*"> <h6 id class="usa-* jcc-*"> <br> <span> <img src alt data-entity-type data-entity-uuid data-align data-caption width height> <drupal-entity data-entity-type data-entity-uuid data-entity-embed-display data-entity-embed-display-settings data-align data-caption data-embed-button data-langcode alt title> <ul type class="jcc-*"> <div id class="jcc-* usa-* active"> <button data-a11y-toggle class="jcc-read-more__trigger usa-button usa-button--unstyled"> <svg role title class="icon icon-expand_more"> <use href> <drupal-media data-entity-type data-entity-uuid data-view-mode data-align data-caption alt title> <p class=" jcc-lead"> <a href hreflang !href accesskey id rel target title class="usa-button usa-button--primary usa-button--secondary usa-button--accent-warm usa-button--external external-button webform-dialo* js-back-button"> <hr> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr>'
+      allowed_html: '<em> <strong> <cite> <blockquote cite> <code> <ol type start> <li class="jcc-*"> <dl> <dt> <dd> <h2 id class="usa-* jcc-*"> <h3 id class="usa-* jcc-*"> <h4 id class="usa-* jcc-*"> <h5 id class="usa-* jcc-*"> <h6 id class="usa-* jcc-*"> <br> <span role class data-a11y-toggle> <img src alt data-entity-type data-entity-uuid data-align data-caption width height> <drupal-entity data-entity-type data-entity-uuid data-entity-embed-display data-entity-embed-display-settings data-align data-caption data-embed-button data-langcode alt title> <ul type class="jcc-*"> <div id class="jcc-* usa-* active"> <button data-a11y-toggle class="jcc-read-more__trigger usa-button usa-button--unstyled"> <svg role title class="icon icon-expand_more"> <use href> <drupal-media data-entity-type data-entity-uuid data-view-mode data-align data-caption alt title> <p class=" jcc-lead"> <a href hreflang !href accesskey id rel target title class="usa-button usa-button--primary usa-button--secondary usa-button--accent-warm usa-button--external external-button webform-dialo* js-back-button"> <hr> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr>'
       filter_html_help: false
       filter_html_nofollow: false
   filter_align:

web/themes/custom/atrium/ckeditor/ckeditor_templates.js

@@ -15,10 +15,10 @@ CKEDITOR.addTemplates('default', {
         const randomId = +new Date();
         return`<p>Text Before</p>
           <div class="jcc-read-more">
-            <button class="jcc-read-more__trigger usa-button usa-button--unstyled" data-a11y-toggle="read-more-${randomId}">
+            <span class="jcc-read-more__trigger usa-button usa-button--unstyled" data-a11y-toggle="read-more-${randomId}">
               What is a judgment
               <svg class="icon icon-expand_more" role="img" title="Expand"><use href="#i-expand_more"></use></svg>
-            </button>
+            </span>
             <div class="jcc-read-more__content" id="read-more-${randomId}">
               If your bank account is levied, you must act quickly! You have only ten days from the date of the levy to file a claim of exempltion (plus five days if the notice was sent be mail) with the sheriff performing the levy.
             </div>

web/themes/custom/atrium/includes/form.inc

@@ -35,6 +35,13 @@ function atrium_form_alter(&$form, FormStateInterface $form_state, $form_id) {
 
   if (isset($form['#webform_id'])) {
     $form['#webform_id_trunc'] = $form['#webform_id'];
+
+    //Patternlab javascript needs to be reloaded on ajax calls for webform
+    $request = \Drupal::request();
+    $is_ajax = $request->isXmlHttpRequest();
+    if($is_ajax){
+      $form['is_ajax'] = true;
+    }
   }
   if (isset($form['#attributes']['class']) && in_array('wayfinder', $form['#attributes']['class']))  {
     atrium_add_suggestion($form, 'webform', 'wayfinder');

web/themes/custom/atrium/templates/webform/webform.html.twig

@@ -6,6 +6,16 @@
  * @see web/modules/contrib/webform/templates/webform.html.twig
  */
 #}
+
+{% if element.is_ajax %}
+  <script>
+      var newContainer = jQuery(".jcc-wayfinder-section");
+      if (newContainer.length){
+        window.a11yToggle(newContainer[0]);
+      }
+  </script>
+{% endif %}
+
 {% if content %}
   {%- include '@molecules/blocks/hero/hero.twig' with {
     hero: {