From 9c8be1025f5f88a8bdf5e359a47cc27fdf62cb2b Mon Sep 17 00:00:00 2001
From: CircleCI <sws-developers@lists.stanford.edu>
Date: Mon, 27 Nov 2023 18:04:01 +0000
Subject: [PATCH 1/2] 10.0.4

---
 .../humsci_default_content/humsci_default_content.info.yml      | 2 +-
 .../humsci_events_listeners/humsci_events_listeners.info.yml    | 2 +-
 .../humsci/su_humsci_profile/su_humsci_profile.info.yml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml
index cabe544d51..5d9da050c9 100644
--- a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml
+++ b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml
@@ -3,7 +3,7 @@ description: 'DO NOT INSTALL. This is for profile installation task only.'
 core_version_requirement: '^9.4 || ^10'
 hidden: true
 type: module
-version: 10.0.3
+version: 10.0.4
 default_content:
   shortcut:
     - 0c69448d-c6fa-4fb8-9b2e-f93f3a955baf
diff --git a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml
index f05fc507ec..68d7178d78 100644
--- a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml
+++ b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml
@@ -16,4 +16,4 @@ dependencies:
   - 'hook_event_dispatcher:views_event_dispatcher'
   - 'rabbit_hole:rabbit_hole'
   - 'drupal:path_alias'
-version: 10.0.3
+version: 10.0.4
diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml
index b7fd8561d9..e742ab0b85 100644
--- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml
+++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml
@@ -1,7 +1,7 @@
 name: 'Stanford HumSci'
 type: profile
 description: 'Installation profile for HumSci Drupal'
-version: 10.0.3
+version: 10.0.4
 core_version_requirement: '^9.4 || ^10'
 themes:
   - material_admin

From 52ef330cbbea00ba79a617a8eee75a87b323b132 Mon Sep 17 00:00:00 2001
From: Mike Decker <pookmish@stanford.edu>
Date: Mon, 27 Nov 2023 13:45:48 -0800
Subject: [PATCH 2/2] HSD8-1531 Fix view field error handling with reset button
 and cache issue

---
 composer.lock                                 | 71 ++++++++++---------
 .../hs_field_helpers.libraries.yml            |  5 +-
 .../js/paragraphs.behaviors.js                |  6 +-
 .../HsViewfieldFormatterDefault.php           |  9 ++-
 .../hs_views_helper.libraries.yml             |  1 +
 .../js/hs_views_helper.views_reset.js         |  7 +-
 6 files changed, 56 insertions(+), 43 deletions(-)

diff --git a/composer.lock b/composer.lock
index c6b876613c..fe9261ca46 100644
--- a/composer.lock
+++ b/composer.lock
@@ -10809,20 +10809,20 @@
         },
         {
             "name": "drupal/search_api",
-            "version": "1.30.0",
+            "version": "1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/search_api.git",
-                "reference": "8.x-1.30"
+                "reference": "8.x-1.31"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.30.zip",
-                "reference": "8.x-1.30",
-                "shasum": "25bd2cfab6a6332c595fbc8be1c4cfff33a85ce8"
+                "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.31.zip",
+                "reference": "8.x-1.31",
+                "shasum": "ec8436744c34de2ede6370d4dd26875489e761bc"
             },
             "require": {
-                "drupal/core": "^9.3 || ^10.0"
+                "drupal/core": "^10.0"
             },
             "conflict": {
                 "drupal/search_api_solr": "2.* || 3.0 || 3.1"
@@ -10840,8 +10840,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.30",
-                    "datestamp": "1697366291",
+                    "version": "8.x-1.31",
+                    "datestamp": "1700926323",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -15120,21 +15120,22 @@
         },
         {
             "name": "pear/pear-core-minimal",
-            "version": "v1.10.13",
+            "version": "v1.10.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/pear-core-minimal.git",
-                "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d"
+                "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/aed862e95fd286c53cc546734868dc38ff4b5b1d",
-                "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d",
+                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/a86fc145edb5caedbf96527214ce3cadc9de4a32",
+                "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32",
                 "shasum": ""
             },
             "require": {
                 "pear/console_getopt": "~1.4",
-                "pear/pear_exception": "~1.0"
+                "pear/pear_exception": "~1.0",
+                "php": ">=5.4"
             },
             "replace": {
                 "rsky/pear-core-min": "self.version"
@@ -15164,7 +15165,7 @@
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR",
                 "source": "https://github.com/pear/pear-core-minimal"
             },
-            "time": "2023-04-19T19:15:47+00:00"
+            "time": "2023-11-26T16:15:38+00:00"
         },
         {
             "name": "pear/pear_exception",
@@ -19946,16 +19947,16 @@
         },
         {
             "name": "codeception/lib-web",
-            "version": "1.0.2",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/lib-web.git",
-                "reference": "f488ff9bc08c8985d43796db28da0bd18813bcae"
+                "reference": "4c02cf57c5f2d14bbb9f57ea09b38ceacec15d91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/lib-web/zipball/f488ff9bc08c8985d43796db28da0bd18813bcae",
-                "reference": "f488ff9bc08c8985d43796db28da0bd18813bcae",
+                "url": "https://api.github.com/repos/Codeception/lib-web/zipball/4c02cf57c5f2d14bbb9f57ea09b38ceacec15d91",
+                "reference": "4c02cf57c5f2d14bbb9f57ea09b38ceacec15d91",
                 "shasum": ""
             },
             "require": {
@@ -19993,9 +19994,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Codeception/lib-web/issues",
-                "source": "https://github.com/Codeception/lib-web/tree/1.0.2"
+                "source": "https://github.com/Codeception/lib-web/tree/1.0.3"
             },
-            "time": "2023-04-18T20:32:51+00:00"
+            "time": "2023-11-27T06:43:13+00:00"
         },
         {
             "name": "codeception/module-asserts",
@@ -22649,16 +22650,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.24.3",
+            "version": "1.24.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083"
+                "reference": "6bd0c26f3786cd9b7c359675cb789e35a8e07496"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/12f01d214f1c73b9c91fdb3b1c415e4c70652083",
-                "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6bd0c26f3786cd9b7c359675cb789e35a8e07496",
+                "reference": "6bd0c26f3786cd9b7c359675cb789e35a8e07496",
                 "shasum": ""
             },
             "require": {
@@ -22690,22 +22691,22 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.3"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.4"
             },
-            "time": "2023-11-18T20:15:32+00:00"
+            "time": "2023-11-26T18:29:22+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.44",
+            "version": "1.10.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "bf84367c53a23f759513985c54ffe0d0c249825b"
+                "reference": "2f024fbb47432e2e62ad8a8032387aa2dd631c73"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bf84367c53a23f759513985c54ffe0d0c249825b",
-                "reference": "bf84367c53a23f759513985c54ffe0d0c249825b",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2f024fbb47432e2e62ad8a8032387aa2dd631c73",
+                "reference": "2f024fbb47432e2e62ad8a8032387aa2dd631c73",
                 "shasum": ""
             },
             "require": {
@@ -22754,7 +22755,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-21T16:30:46+00:00"
+            "time": "2023-11-27T14:15:06+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
@@ -24525,12 +24526,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/SU-SWS/stanford-caravan.git",
-                "reference": "2c634a3be6ba240e8d08a67e69925d69610ffa11"
+                "reference": "b8ed0ed7c23c41ff289dbda251c50b7e6a73beb9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SU-SWS/stanford-caravan/zipball/2c634a3be6ba240e8d08a67e69925d69610ffa11",
-                "reference": "2c634a3be6ba240e8d08a67e69925d69610ffa11",
+                "url": "https://api.github.com/repos/SU-SWS/stanford-caravan/zipball/b8ed0ed7c23c41ff289dbda251c50b7e6a73beb9",
+                "reference": "b8ed0ed7c23c41ff289dbda251c50b7e6a73beb9",
                 "shasum": ""
             },
             "require": {
@@ -24560,7 +24561,7 @@
                 "issues": "https://github.com/SU-SWS/stanford-caravan/issues",
                 "source": "https://github.com/SU-SWS/stanford-caravan/tree/10.x"
             },
-            "time": "2023-10-11T15:30:44+00:00"
+            "time": "2023-11-24T17:36:31+00:00"
         },
         {
             "name": "symfony/browser-kit",
diff --git a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.libraries.yml b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.libraries.yml
index c003df6c5e..8132976978 100644
--- a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.libraries.yml
+++ b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.libraries.yml
@@ -21,4 +21,7 @@ paragraph_behaviors:
     js/paragraphs.behaviors.js: {  }
   css:
     base:
-      css/paragraphs.behaviors.css: {  }
\ No newline at end of file
+      css/paragraphs.behaviors.css: {  }
+  dependencies:
+    - core/jquery
+    - core/once
diff --git a/docroot/modules/humsci/hs_field_helpers/js/paragraphs.behaviors.js b/docroot/modules/humsci/hs_field_helpers/js/paragraphs.behaviors.js
index 723bad40b2..88b096f602 100644
--- a/docroot/modules/humsci/hs_field_helpers/js/paragraphs.behaviors.js
+++ b/docroot/modules/humsci/hs_field_helpers/js/paragraphs.behaviors.js
@@ -3,13 +3,13 @@
  * Stops page from changing when user is posting.
  */
 
-(function ($, Drupal) {
+(function ($, Drupal, once) {
   'use strict';
 
   Drupal.behaviors.humsciParagraphBehaviors = {
     attach: function (context, settings) {
       $('ul.paragraphs-tabs', context).remove();
-      $('.paragraphs-subform', context).once('hs-heaviors').each(function () {
+      $(once('hs-behaviors', '.paragraphs-subform', context)).each(function () {
         const $subform = $(this);
         const $behaviors = $(this).siblings('.paragraphs-behavior')
         const $tabs = $('<ul class="hs-paragraphs-tabs tabs">');
@@ -32,4 +32,4 @@
       });
     }
   };
-})(jQuery, Drupal);
+})(jQuery, Drupal, once);
diff --git a/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldFormatter/HsViewfieldFormatterDefault.php b/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldFormatter/HsViewfieldFormatterDefault.php
index 76886ec98a..1af97ce86b 100644
--- a/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldFormatter/HsViewfieldFormatterDefault.php
+++ b/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldFormatter/HsViewfieldFormatterDefault.php
@@ -3,6 +3,7 @@
 namespace Drupal\hs_field_helpers\Plugin\Field\FieldFormatter;
 
 use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Form\EnforcedResponseException;
 use Drupal\Core\Logger\LoggerChannelTrait;
 use Drupal\viewfield\Plugin\Field\FieldFormatter\ViewfieldFormatterDefault;
 use Drupal\views\ViewExecutable;
@@ -24,9 +25,15 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
       $elements = parent::viewElements($items, $langcode);
     }
     catch (\Throwable $e) {
+      if ($e instanceof EnforcedResponseException) {
+        throw $e;
+      }
+
       $this->getLogger('hs_field_helpers')
         ->error('Error during rendering: ' . $e->getMessage());
-      return [];
+      return [
+        '#markup' => $this->t('An error occurred when generating your content.'),
+      ];
     }
 
     // Add and customize the view title.
diff --git a/docroot/modules/humsci/hs_views_helper/hs_views_helper.libraries.yml b/docroot/modules/humsci/hs_views_helper/hs_views_helper.libraries.yml
index 77b66c17c0..f05ffe1ec6 100644
--- a/docroot/modules/humsci/hs_views_helper/hs_views_helper.libraries.yml
+++ b/docroot/modules/humsci/hs_views_helper/hs_views_helper.libraries.yml
@@ -4,3 +4,4 @@ views_reset:
     js/hs_views_helper.views_reset.js: {}
   dependencies:
     - core/drupal.ajax
+    - core/once
diff --git a/docroot/modules/humsci/hs_views_helper/js/hs_views_helper.views_reset.js b/docroot/modules/humsci/hs_views_helper/js/hs_views_helper.views_reset.js
index 2dc7f7e84c..e84733267e 100644
--- a/docroot/modules/humsci/hs_views_helper/js/hs_views_helper.views_reset.js
+++ b/docroot/modules/humsci/hs_views_helper/js/hs_views_helper.views_reset.js
@@ -1,4 +1,4 @@
-(function ($, Drupal) {
+(function ($, Drupal, once) {
   'use strict';
 
   Drupal.behaviors.hsFieldHelpersViewsReset = {
@@ -7,7 +7,8 @@
         return;
       }
       $.each(Drupal.views.instances, function (key, ajaxView) {
-        ajaxView['$exposed_form'].find('input[data-drupal-selector=edit-reset]').once('views-reset').click(function (e) {
+
+        $(once('views-reset', ajaxView['$exposed_form'].find('input[data-drupal-selector=edit-reset]'))).click(function (e) {
           e.preventDefault();
 
           // Reset the form and trigger chosen select fields.
@@ -27,4 +28,4 @@
       });
     }
   };
-})(jQuery, Drupal);
+})(jQuery, Drupal, once);