Merge pull request #2531 from department-of-veterans-affairs/2024_08_…

…21_RC_s80c1_updates rc s80c1 updates 2024 08 21
department-of-veterans-affairs · Aug 22, 2024 · 41f775e · 41f775e
2 parents e8c7d5d + 384b1a9
commit 41f775e
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 17 deletions.
diff --git a/LEAF_Nexus/js/employeeSelector.js b/LEAF_Nexus/js/employeeSelector.js
@@ -54,7 +54,7 @@ employeeSelector.prototype.initialize = function () {
       'input" type="search" class="employeeSelectorInput" aria-label="search input"/></div>\
 			<div id="' +
       this.prefixID +
-      'result"></div>'
+      'result" role="status" aria-label="search results"></div>'
   );
 
   $("#" + this.prefixID + "input").on("keydown", function (e) {

diff --git a/LEAF_Nexus/js/nationalEmployeeSelector.js b/LEAF_Nexus/js/nationalEmployeeSelector.js
@@ -107,7 +107,7 @@ nationalEmployeeSelector.prototype.initialize = function () {
       '"/></div>\
 			<div id="' +
       this.prefixID +
-      'result"></div>'
+      'result" role="status" aria-label="search results"></div>'
   );
 
   $("#" + this.prefixID + "input").on("keydown", function (e) {

diff --git a/LEAF_Request_Portal/admin/templates/main.tpl b/LEAF_Request_Portal/admin/templates/main.tpl
@@ -70,8 +70,8 @@
                 <em class="usa-logo__text">
                     <a onclick="window.location='./'" title="Home" aria-label="LEAF home" class="leaf-cursor-pointer">
                         <span class="leaf-logo">{$logo}</span>
-                        <h1 class="leaf-site-title">{$title}</h1>
-                        <h2 id="headerDescription" class="leaf-header-description">{$city}</h2>
+                        <span class="leaf-site-title">{$city}</span>
+                        <span id="headerDescription" class="leaf-header-description">{$title}</span>
                     </a>
                 </em>
                 {if $qrcodeURL != ''}

diff --git a/LEAF_Request_Portal/admin/templates/mod_system.tpl b/LEAF_Request_Portal/admin/templates/mod_system.tpl
@@ -34,7 +34,7 @@
             <div class="leaf-marginTop-halfRem"><span id="leafSecureStatus">Loading...</span></div>
 
             <div>
-                <div for="importTags" class="usa-label">Import Tags [<a href="#" title="Groups in the Org. Chart with any one of these tags will be imported for use">?</a>]:&nbsp;</div>
+                <div class="usa-label">Import Tags [<a href="#" title="Groups in the Org. Chart with any one of these tags will be imported for use">?</a>]:&nbsp;</div>
                 <div class="leaf-marginTop-1rem">
                     <!--{foreach from=$importTags item=importTag}-->
                         <!--{$importTag}--><br />
@@ -117,7 +117,7 @@ function saveSettings() {
                 },
                 success: function(res) {
                     siteSettings.heading = heading;
-                    $('#logo .leaf-site-title').html(heading);
+                    $('#headerDescription').html(heading);
                 },
                 error: function(err) {
                     console.log(err);
@@ -137,7 +137,7 @@ function saveSettings() {
                 },
                 success: function(res) {
                     siteSettings.subHeading = subHeading;
-                    $('#headerDescription').html(subHeading);
+                    $('#logo .leaf-site-title').html(subHeading);
                 },
                 error: function(err) {
                     console.log(err);

diff --git a/app/libs/js/vue-dest/form_editor/LEAF_FormEditor.css b/app/libs/js/vue-dest/form_editor/LEAF_FormEditor.css
diff --git a/app/libs/js/vue-dest/form_editor/LEAF_FormEditor.js b/app/libs/js/vue-dest/form_editor/LEAF_FormEditor.js
diff --git a/app/libs/js/vue-dest/form_editor/LEAF_FormEditor.js.LICENSE.txt b/app/libs/js/vue-dest/form_editor/LEAF_FormEditor.js.LICENSE.txt
@@ -1,7 +1,7 @@
 /*! #__NO_SIDE_EFFECTS__ */
 
 /**
-* @vue/shared v3.4.33
+* @vue/shared v3.4.38
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
diff --git a/app/libs/js/vue-dest/form_editor/form-editor-view.chunk.js b/app/libs/js/vue-dest/form_editor/form-editor-view.chunk.js
diff --git a/app/libs/js/vue-dest/site_designer/LEAF_Designer.js b/app/libs/js/vue-dest/site_designer/LEAF_Designer.js
diff --git a/app/libs/js/vue-dest/site_designer/LEAF_Designer.js.LICENSE.txt b/app/libs/js/vue-dest/site_designer/LEAF_Designer.js.LICENSE.txt
@@ -1,7 +1,7 @@
 /*! #__NO_SIDE_EFFECTS__ */
 
 /**
-* @vue/shared v3.4.33
+* @vue/shared v3.4.38
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
diff --git a/docker/vue-app/src/form_editor/LEAF_FormEditor.scss b/docker/vue-app/src/form_editor/LEAF_FormEditor.scss
@@ -313,6 +313,7 @@ table[class$="SelectorTable"] th {
             #view_workflow {
                 font-size: 14px;
                 height: 26px;
+                text-decoration: underline;
             }
         }
     }

diff --git a/docker/vue-app/src/form_editor/components/form_editor_view/FormQuestionDisplay.js b/docker/vue-app/src/form_editor/components/form_editor_view/FormQuestionDisplay.js
@@ -110,6 +110,7 @@ export default {
                             Modify Logic
                         </button>
                         <button v-if="!isHeader" type="button" class="btn-general"
+                            title="add sub-question"
                             aria-label="add sub-question"
                             @click="newQuestion(indicatorID)">
                             + Sub-question

diff --git a/docker/vue-app/src/form_editor/views/FormEditorView.js b/docker/vue-app/src/form_editor/views/FormEditorView.js
@@ -929,7 +929,7 @@ export default {
                     <div v-if="!previewMode" id="blank_section_preview">
                         <button type="button" class="btn-general"
                             @click="newQuestion(null)"
-                            aria-label="Add new form section">
+                            aria-label="Add Section">
                             + Add Section
                         </button>
                     </div>

diff --git a/test/Test-Automation/src/main/java/pages/FormEditorPageActions.java b/test/Test-Automation/src/main/java/pages/FormEditorPageActions.java
@@ -83,7 +83,8 @@ public class FormEditorPageActions extends BasePage {
     @FindBy(xpath = "//textarea[@id=\"name\"]")
     WebElement sectionDescription;
 
-    @FindBy(xpath = "/html/body/div[1]/div/div/main/section/div[2]/div[2]/div[1]/ul/li/div/ul/li/div/div/div/div[2]")
+    //@FindBy(xpath = "//ul[contains(@id,'base_drop_area_form')]//li/div/ul/li/div/div/div/div[contains(@class, 'indicator-name-preview')]")
+    @FindBy(xpath = "//ul[contains(@id,'base_drop_area_form')]//li/div/ul/li//div[contains(@class, 'indicator-name-preview')]")
     WebElement createdQuestionHeading;
 
     @FindBy(xpath = "//div[contains(@id,'format_label')]")

diff --git a/x-test/end2end/tests/lifecycleSimpleTravel.spec.ts b/x-test/end2end/tests/lifecycleSimpleTravel.spec.ts
@@ -90,11 +90,11 @@ test('navigate to Form Editor and create a travel form', async ({ page }, testIn
   await page.getByRole('button', { name: 'Save' }).click();
   await expect(page.getByLabel('Form name')).toHaveValue(uniqueText);
 
-  await page.getByRole('button', { name: '+ Add Section' }).click();
+  await page.getByRole('button', { name: 'Add Section' }).click();
   await page.getByLabel('Section Heading').click();
   await page.getByLabel('Section Heading').fill('Traveler');
   await page.getByRole('button', { name: 'Save' }).click();
-  await page.getByRole('button', { name: '+ Add Question to Section' }).click();
+  await page.getByRole('button', { name: 'Add Question to Section' }).click();
   await page.getByLabel('Field Name').click();
   await page.getByLabel('Field Name').fill('Employee');
   await page.getByLabel('Input Format').selectOption('orgchart_employee');