VACMS-15717: Change reusable Q&As header structure (#1845)

--------- Co-authored-by: Chris Kim <[email protected]>
department-of-veterans-affairs · Jan 10, 2024 · 31943d8 · 31943d8
1 parent 019d4ce
commit 31943d8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/site/layouts/faq_multiple_q_a.drupal.liquid b/src/site/layouts/faq_multiple_q_a.drupal.liquid
@@ -67,20 +67,22 @@
               {% if fieldQAGroup.entity.fieldSectionHeader %}
                 <h2>{{ fieldQAGroup.entity.fieldSectionHeader }}</h2>
               {% endif %}
-
-              {% if fieldQAGroup.entity.fieldAccordionDisplay %}
-                <va-accordion>
+            {% if fieldQAGroup.entity.fieldAccordionDisplay %}
+              {% assign headerLevel = '2' %}
+              {% if fieldQAGroup.entity.fieldSectionHeader %}
+                {% assign headerLevel = '3' %}
+              {% endif %}
+              <va-accordion>
                 {% assign groupId = fieldQAGroup.entity.entityId %}
                   {% for fieldQA in fieldQAGroup.entity.fieldQAs %}
                     {% if fieldQA.entity %}
                       <va-accordion-item
                         class="va-accordion-item"
+                        level="{{ headerLevel }}"
+                        header="{{fieldQA.entity.title}}"
                         data-faq-entity-id="{{ fieldQA.entity.entityId }}"
                         id="{{ fieldQA.entity.title | hashReference: 60 }}"
                       >
-                        <h3 slot="headline">
-                          {{ fieldQA.entity.title }}
-                        </h3>
                         <div id="{{ fieldQA.entity.entityBundle }}-{{ fieldQA.entity.entityId }}-{{ groupId }}">
                           {% assign fieldAnswer = fieldQA.entity.fieldAnswer %}
                           {% assign bundleComponent = "src/site/paragraphs/" | append: fieldAnswer.entity.entityBundle %}

diff --git a/src/site/paragraphs/q_a_group_collapsible_content.drupal.liquid b/src/site/paragraphs/q_a_group_collapsible_content.drupal.liquid
@@ -1,8 +1,10 @@
 {% assign fieldQAs = entity.queryFieldQAs.entities %}
 
 <!-- Optional section header -->
+{% assign headerLevel = "2" %}
 {% if entity.fieldSectionHeader %}
   <h2>{{ entity.fieldSectionHeader }}</h2>
+  {% assign  headerLevel = "3" %}
 {% endif %}
 
 <!-- Optional QA Group Introduction -->
@@ -13,7 +15,7 @@
 <va-accordion>
   {% for item in fieldQAs %}
     {% assign id = item.entityId %}
-    <va-accordion-item header="{{ item.entityLabel }}" id="{{ item.entityLabel | hashReference: 60 }}">
+    <va-accordion-item header="{{ item.entityLabel }}" level="{{ headerLevel }}" id="{{ item.entityLabel | hashReference: 60 }}">
       <div id={{ id }} data-entity-id="{{ id }}">
         <div id="{{ item.fieldAnswer.entity.entityBundle }}-{{ item.fieldAnswer.entity.entityId }}">
           {% if item.fieldAnswer %}