Merge pull request #2370 from massgov/release/0.387.0

Release 0.387.0
massgov · Jan 30, 2024 · ffc25b0 · ffc25b0
2 parents 8db1823 + 47d6dc2
commit ffc25b0
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+
+
+## [0.387.0] - January 29, 2024
+
+### Fixed
+  - DP-31366: Fixed sporadic issues with location listing search.
+  - DP-31620: News headlines on org pages are the same heading level as the "News" header.
+  - DP-31624: Make sure master and develop are up to date before merging a hotfix
+
+### Added
+  - DP-31561: Add name attributes to forms.
+  - DP-31561: Add hidden fields to userway signup form for Formstack submission.
+
 ## [0.386.1] - January 25, 2024
 
 ### Fixed

diff --git a/composer.lock b/composer.lock
diff --git a/docroot/modules/custom/mayflower/src/Prepare/Molecules.php b/docroot/modules/custom/mayflower/src/Prepare/Molecules.php
@@ -1263,6 +1263,7 @@ public static function prepareHeaderSearch(object $entity = NULL, array &$cache_
     return [
       'hasSuggestions' => $has_suggestions,
       'suggestedScopes' => $suggested_scopes,
+      'name' => 'header-search',
       'id' => 'header-search',
       'placeholder' => 'Search Mass.gov',
       'label' => 'Search terms',

diff --git a/docroot/themes/custom/mass_theme/templates/includes/molecules-banner-search.html.twig b/docroot/themes/custom/mass_theme/templates/includes/molecules-banner-search.html.twig
@@ -6,7 +6,7 @@
 #}
   {#{{ kint(searchFormId) }}#}
 {% block content %}
-<form class="ma__search-banner__form" action="https://search.mass.gov/" role="search">
+<form class="ma__search-banner__form" action="https://search.mass.gov/" role="search" name="homepage-search">
   <div class="ma__search-banner__input js-suggestions-container">
     <input
         id="banner-search"

diff --git a/docroot/themes/custom/mass_theme/templates/navigation/menu--utility.html.twig b/docroot/themes/custom/mass_theme/templates/navigation/menu--utility.html.twig
@@ -70,6 +70,8 @@ set googleLanguages = languages
                 "fieldSubmit": {
                   "isForm": true,
                   "id": 'fsForm5560495',
+                  "hiddenInputs": "<input type='hidden' tabindex='-1' name='formstackFormSchemaVersion' value='4'><input type='hidden' tabindex='-1' name='formstackFormRendererVersion' value='master'><input type='hidden' tabindex='-1' name='form' value='5560495'><input type='hidden' tabindex='-1' name='viewkey' value='WKfdPIXNKO'><input type='hidden' tabindex='-1' name='password' value=''><input type='hidden' tabindex='-1' name='hidden_fields' value=''><input type='hidden' tabindex='-1' name='_submit' value='1'><input type='hidden' tabindex='-1' name='incomplete' value=''><input type='hidden' tabindex='-1' name='incomplete_email' value=''><input type='hidden' tabindex='-1' name='incomplete_password' value=''><input type='hidden' tabindex='-1' name='latitude' value=''><input type='hidden' tabindex='-1' name='longitude' value=''><input id='fsUserAgent' type='hidden' tabindex='-1' name='fsUserAgent' value='Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Mobile Safari/537.36'>",
+                  "name": "userWay-signup-form",
                   "action": "https://www.formstack.com/forms/index.php",
                   "labelText": "If we can email you to ask about your experience with this feature, please add your email.",
                   "inputText": {

diff --git a/scripts/changelog-body.txt b/scripts/changelog-body.txt
@@ -1,23 +1,13 @@
 
 
-## [0.386.0] - January 23, 2024
-
-### Changed
-  - DP-24989: Change sort of autocomplete to put organizations, topics, services first.
-  - DP-30894: Populate contextual search field values.
-  - DP-31442: Rename 'Analytics New' to 'Analytics'.
-
-### Added
-  - DP-29407: Add a heading and skip link to video component.
+## [0.387.0] - January 29, 2024
 
 ### Fixed
-  - DP-30532: Fix TOC - don't show "more" when there aren't more.
-  - DP-30820: Stop collection_all View from spamming the watchdog log.
-  - DP-31106: Bump entity_usage_queue_tracking module for excess deletion fix
-  - DP-31532: Backport of permission fix for media entity view needed by authors.
-  - DP-31551: Avoid error when showing error on the reschedule transition form
-  - DP-31571: Fixed error causing the nightly Backstop snapshot job to fail.
-
-### Security
-  - DP-31535: Drupal core - Moderately critical - Denial of Service - SA-CORE-2024-001.
-
+  - DP-31366: Fixed sporadic issues with location listing search.
+  - DP-31620: News headlines on org pages are the same heading level as the "News" header.
+  - DP-31624: Make sure master and develop are up to date before merging a hotfix
+
+### Added
+  - DP-31561: Add name attributes to forms.
+  - DP-31561: Add hidden fields to userway signup form for Formstack submission.
+
diff --git a/scripts/master-to-develop b/scripts/master-to-develop
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
 set -e
+git fetch origin master
 git checkout develop
+git pull
 git merge origin/master
 git push