10.0.4

SU-HSDO · Nov 27, 2023 · 50f8aba · 50f8aba
2 parents da08c36 + 52ef330
commit 50f8aba
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 46 deletions.
diff --git a/composer.lock b/composer.lock
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
@@ -21,4 +21,7 @@ paragraph_behaviors:
     js/paragraphs.behaviors.js: {  }
   css:
     base:
-      css/paragraphs.behaviors.css: {  }
+      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
@@ -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/...s/humsci/hs_field_helpers/src/Plugin/Field/FieldFormatter/HsViewfieldFormatterDefault.php b/...s/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
@@ -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
@@ -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);
diff --git a/...s/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml b/...s/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/...humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml b/...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
@@ -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