Merge pull request #334 from Bixal/hotfix/1.6.3

Integrate Hotfix/1.6.3 to develop

composer.json

@@ -84,6 +84,7 @@
         "drupal/role_delegation": "^1.2",
         "drupal/search_api_solr": "^4.3",
         "drupal/seckit": "^2.0",
+        "drupal/sitewide_alert": "^2.2",
         "drupal/stable": "^2.0",
         "drupal/svg_image_field": "^2.3",
         "drupal/twig_field_value": "^2.0",

composer.log

@@ -44,3 +44,4 @@ e854b19c73ce4a93589f51c9e10dfd5c|Matt Poole|feature/BSD-300-update-deps|Tue Sep
 c844a0df1fb652429755003179a5177c|Matt Poole|feature/BSD-305-dep-update|Tue Oct 15 15:56:33 EDT 2024|./composer.sh update
 887db95451678c154f246321d8883647|Matt Poole|feature/BSD-305-dep-update|Tue Oct 15 16:03:26 EDT 2024|./composer.sh require drupal/autocomplete_deluxe
 56ccb5a257914e0eced9c581db3dc19d|Matt Poole|release/1.5.0|Wed Oct 16 09:17:37 EDT 2024|./composer.sh update
+835eac30efa74f467f99dea027b5e553|Matt Poole|feature/BSD-329-site-wide-alert-be|Fri Nov  1 15:48:57 EDT 2024|./composer.sh require drupal/sitewide_alert

config/sync/core.entity_form_display.sitewide_alert.sitewide_alert.default.yml

@@ -0,0 +1,50 @@
+uuid: 693f7e7b-a814-4a6e-8c60-1efc4ad06257
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.sitewide_alert.sitewide_alert.field_heading
+    - field.field.sitewide_alert.sitewide_alert.field_no_icon
+    - field.field.sitewide_alert.sitewide_alert.field_slim
+  module:
+    - datetime_range
+    - sitewide_alert
+    - text
+id: sitewide_alert.sitewide_alert.default
+targetEntityType: sitewide_alert
+bundle: sitewide_alert
+mode: default
+content:
+  field_heading:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  field_no_icon:
+    type: boolean_checkbox
+    weight: 3
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
+  field_slim:
+    type: boolean_checkbox
+    weight: 2
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
+  message:
+    type: text_textarea
+    weight: 1
+    region: content
+    settings:
+      rows: 4
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  langcode: true
+  user_id: true

config/sync/core.entity_view_display.sitewide_alert.sitewide_alert.default.yml

@@ -0,0 +1,29 @@
+uuid: fd537a2d-5599-4548-b215-cfbd00cb596c
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.sitewide_alert.sitewide_alert.field_heading
+    - field.field.sitewide_alert.sitewide_alert.field_no_icon
+    - field.field.sitewide_alert.sitewide_alert.field_slim
+  module:
+    - sitewide_alert
+    - text
+id: sitewide_alert.sitewide_alert.default
+targetEntityType: sitewide_alert
+bundle: sitewide_alert
+mode: default
+content:
+  message:
+    type: text_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  field_heading: true
+  field_no_icon: true
+  field_slim: true
+  langcode: true
+  search_api_excerpt: true

config/sync/core.extension.yml

@@ -28,6 +28,7 @@ module:
   cookies: 0
   ctools: 0
   datetime: 0
+  datetime_range: 0
   dblog: 0
   decorative_image_widget: 0
   default_content: 0
@@ -77,6 +78,7 @@ module:
   search_api_solr: 0
   seckit: 0
   site_wrapper: 0
+  sitewide_alert: 0
   svg_image_field: 0
   system: 0
   taxonomy: 0

config/sync/field.field.sitewide_alert.sitewide_alert.field_heading.yml

@@ -0,0 +1,20 @@
+uuid: 45c25223-f42b-4cd0-a3f6-919c616b553e
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.sitewide_alert.field_heading
+  module:
+    - sitewide_alert
+id: sitewide_alert.sitewide_alert.field_heading
+field_name: field_heading
+entity_type: sitewide_alert
+bundle: sitewide_alert
+label: heading
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string

config/sync/field.field.sitewide_alert.sitewide_alert.field_no_icon.yml

@@ -0,0 +1,22 @@
+uuid: 02d9ebfc-cee1-4aa2-bb9c-244d278edae5
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.sitewide_alert.field_no_icon
+  module:
+    - sitewide_alert
+id: sitewide_alert.sitewide_alert.field_no_icon
+field_name: field_no_icon
+entity_type: sitewide_alert
+bundle: sitewide_alert
+label: 'No Icon'
+description: "Display an site alert without an icon.\r\n"
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean

config/sync/field.field.sitewide_alert.sitewide_alert.field_slim.yml

@@ -0,0 +1,22 @@
+uuid: 8d38ea0c-644a-4e1f-9c72-e25d257df941
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.sitewide_alert.field_slim
+  module:
+    - sitewide_alert
+id: sitewide_alert.sitewide_alert.field_slim
+field_name: field_slim
+entity_type: sitewide_alert
+bundle: sitewide_alert
+label: Slim
+description: 'Display a slimmer version of the site alert.'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean

config/sync/field.storage.sitewide_alert.field_heading.yml

@@ -0,0 +1,21 @@
+uuid: 46dadca5-145f-4799-bdec-08c58563b5f1
+langcode: en
+status: true
+dependencies:
+  module:
+    - sitewide_alert
+id: sitewide_alert.field_heading
+field_name: field_heading
+entity_type: sitewide_alert
+type: string
+settings:
+  max_length: 255
+  case_sensitive: false
+  is_ascii: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

config/sync/field.storage.sitewide_alert.field_no_icon.yml

@@ -0,0 +1,18 @@
+uuid: 05882359-9a81-4dd1-8aab-218cdbcf286c
+langcode: en
+status: true
+dependencies:
+  module:
+    - sitewide_alert
+id: sitewide_alert.field_no_icon
+field_name: field_no_icon
+entity_type: sitewide_alert
+type: boolean
+settings: {  }
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

config/sync/field.storage.sitewide_alert.field_slim.yml

@@ -0,0 +1,18 @@
+uuid: 797e9cc6-2a37-4992-92da-5c8f06479f6b
+langcode: en
+status: true
+dependencies:
+  module:
+    - sitewide_alert
+id: sitewide_alert.field_slim
+field_name: field_slim
+entity_type: sitewide_alert
+type: boolean
+settings: {  }
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

config/sync/sitewide_alert.settings.yml

@@ -0,0 +1,8 @@
+_core:
+  default_config_hash: 0y_QHS2RsEHVusPnhiEqDUshLy8-YqDaXtafZJdYjXA
+show_on_admin: 0
+alert_styles: "info|Info\r\nemergency|Emergency"
+display_order: ascending
+refresh_interval: 15
+automatic_refresh: 0
+cache_max_age: 300

config/sync/user.role.anonymous.yml

@@ -6,6 +6,7 @@ dependencies:
     - config_pages
     - contact
     - media
+    - sitewide_alert
     - system
 _core:
   default_config_hash: j5zLMOdJBqC0bMvSdth5UebkprJB8g_2FXHqhfpJzow
@@ -18,3 +19,4 @@ permissions:
   - 'access site-wide contact form'
   - 'view accreditations config page entity'
   - 'view media'
+  - 'view published sitewide alert entities'

config/sync/user.role.authenticated.yml

@@ -11,6 +11,7 @@ dependencies:
     - filter
     - media
     - node
+    - sitewide_alert
     - system
 _core:
   default_config_hash: dJ0L2DNSj5q6XVZAGsuVDpJTh5UeYkIPwKrUOOpr8YI
@@ -27,3 +28,4 @@ permissions:
   - 'view all revisions'
   - 'view media'
   - 'view own unpublished content'
+  - 'view published sitewide alert entities'

web/themes/custom/bixal_uswds/bixal_uswds.theme

@@ -6,6 +6,7 @@
  */
 
 require_once dirname(__FILE__) . '/php-includes/block.inc';
+require_once dirname(__FILE__) . '/php-includes/content.inc';
 require_once dirname(__FILE__) . '/php-includes/form.inc';
 require_once dirname(__FILE__) . '/php-includes/media.inc';
 require_once dirname(__FILE__) . '/php-includes/local_task.inc';

web/themes/custom/bixal_uswds/gulpfile.js

@@ -209,5 +209,5 @@ exports.watch = parallel(watchCompFiles, logVersion, buildSass, watchSass, brows
 exports.update = uswds.updateUswds;
 exports.copyAssets = uswds.copyAssets;
 exports.compileSass = series(logVersion, buildSass);
-exports.compile = series(logVersion, parallel(buildSass, uswds.compileIcons, buildJS));
+exports.compile = series(logVersion, parallel(buildSass, uswds.compileIcons, buildJS, uswds.copyAssets));
 exports.default = this.compile;

web/themes/custom/bixal_uswds/php-includes/content.inc

@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * @file
+ * Preprocess function for content.
+ */
+
+/**
+ * Implements hook_preprocess_HOOK().
+ */
+function bixal_uswds_preprocess_sitewide_alert(&$variables): void {
+  $variables['slim'] = (bool) $variables['sitewide_alert']->get('field_slim')->getString();
+  $variables['no_icon'] = (bool) $variables['sitewide_alert']->get('field_no_icon')->getString();
+  $variables['style'] = $variables['sitewide_alert']->get('style')->getString();
+  $variables['heading'] = $variables['sitewide_alert']->get('field_heading')->getString();
+}

web/themes/custom/bixal_uswds/src/sass/styles.scss

@@ -8,6 +8,7 @@
 @forward "uswds-core";
 @forward "usa-skipnav";
 @forward "usa-pagination";
+@forward "usa-site-alert";
 
 // Custom styles
 @forward "uswds-theme-custom-styles";

web/themes/custom/bixal_uswds/src/sass/uswds-overrides/_index.scss

@@ -1,7 +1,6 @@
 // Add any custom component files here using @forward.
 @forward "override-usa-hero";
 @forward "override-usa-header";
-@forward "override-usa-site-alert";
 @forward "override-usa-collection";
 @forward "override-usa-skipnav"