From 29eee90abacba70239efe94b937e1809ce74518a Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Fri, 19 Nov 2021 13:52:45 -0500
Subject: [PATCH 01/87] [EPAD8-1494] add scrollable tables

---
 .../table--scrollable/table--scrollable.md    | 24 ++++++
 .../table--scrollable/table--scrollable.twig  | 13 ++++
 .../table--scrollable/table--scrollable.yml   | 74 +++++++++++++++++++
 .../_patterns/03-uswds/table/table.twig       |  2 +
 4 files changed, 113 insertions(+)
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table--scrollable/table--scrollable.md
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table--scrollable/table--scrollable.twig
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table--scrollable/table--scrollable.yml

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table--scrollable/table--scrollable.md b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table--scrollable/table--scrollable.md
new file mode 100644
index 0000000000..388dfc6ff8
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table--scrollable/table--scrollable.md
@@ -0,0 +1,24 @@
+---
+el: .usa-table--scrollable
+title: Scrollable Table
+state: inreview
+---
+See [https://designsystem.digital.gov/components/table/]() and
+[https://components.designsystem.digital.gov/components/detail/tables.html]().
+
+__Variables:__
+* modifier_classes: [string] Optional additional CSS classes.
+* caption: [string] Table caption.
+* scrollable: [boolean] Sets scrollable container.
+* header: [array] Header cells. Each item is an object containing:
+  * attributes: [string] HTML attributes of the cell.
+  * content: [string] Content of the cell.
+* footer: [array] Footer cells. Each item is an object containing:
+  * attributes: [string] HTML attributes of the cell.
+  * content: [string] Content of the cell.
+* rows: [array] Table rows. Each item is an object containing:
+  * attributes: [string] HTML attributes of the row.
+  * cells: [array] Table cells. Each item is an object containing:
+    * tag: [string] HTML tag that wraps the cell. (`th` or `td`)
+    * attributes: [string] HTML attributes of the cell.
+    * content: [string] Content of the cell.
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table--scrollable/table--scrollable.twig b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table--scrollable/table--scrollable.twig
new file mode 100644
index 0000000000..5a7d623e66
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table--scrollable/table--scrollable.twig
@@ -0,0 +1,13 @@
+{% set classes = [
+  'usa-table--scrollable',
+  modifier_classes ? modifier_classes,
+]|join(' ')|trim %}
+
+{% include "@uswds/table/table.twig" with {
+  'modifier_classes': classes,
+  'caption': caption,
+  'header': header,
+  'footer': footer,
+  'rows': rows,
+  'scrollable': true,
+}%}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table--scrollable/table--scrollable.yml b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table--scrollable/table--scrollable.yml
new file mode 100644
index 0000000000..4b2a5b1a40
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table--scrollable/table--scrollable.yml
@@ -0,0 +1,74 @@
+modifier_classes: ''
+caption: 'Scrollable table'
+header:
+  -
+    attributes: ' scope="col"'
+    content: 'Document title'
+  -
+    attributes: ' scope="col"'
+    content: 'Description'
+  -
+    attributes: ' scope="col"'
+    content: 'Year'
+footer: false
+rows:
+  -
+    attributes: ''
+    cells:
+      -
+        tag: 'th'
+        attributes: ' scope="row"'
+        content: 'Declaration of Independence'
+      -
+        tag: 'td'
+        attributes: ''
+        content: 'Statement adopted by the Continental Congress declaring independence from the British Empire.'
+      -
+        tag: 'td'
+        attributes: ''
+        content: '1776'
+  -
+    attributes: ''
+    cells:
+      -
+        tag: 'th'
+        attributes: ' scope="row"'
+        content: 'Bill of Rights'
+      -
+        tag: 'td'
+        attributes: ''
+        content: 'The first ten amendments of the U.S. Constitution guaranteeing rights and freedoms.'
+      -
+        tag: 'td'
+        attributes: ''
+        content: '1791'
+  -
+    attributes: ''
+    cells:
+      -
+        tag: 'th'
+        attributes: ' scope="row"'
+        content: 'Declaration of Sentiments'
+      -
+        tag: 'td'
+        attributes: ''
+        content: 'A document written during the Seneca Falls Convention outlining the rights that American women should be entitled to as citizens.'
+      -
+        tag: 'td'
+        attributes: ''
+        content: '1848'
+  -
+    attributes: ''
+    cells:
+      -
+        tag: 'th'
+        attributes: ' scope="row"'
+        content: 'Emancipation Proclamation'
+      -
+        tag: 'td'
+        attributes: ''
+        content: 'An executive order granting freedom to slaves in designated southern states.'
+      -
+        tag: 'td'
+        attributes: ''
+        content: '1863'
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table.twig b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table.twig
index 420ed91029..6f74884dd0 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table.twig
@@ -3,6 +3,7 @@
   modifier_classes ? modifier_classes,
 ]|join(' ')|trim %}
 
+{% if scrollable %}<div class="usa-table-container--scrollable" tabindex="0">{% endif %}
 <table class="{{ classes }}">
   {% if caption %}
     <caption>{{ caption }}</caption>
@@ -49,3 +50,4 @@
 {% if sortable %}
   <div class="usa-sr-only usa-table__announcement-region" aria-live="polite"></div>
 {% endif %}
+{% if scrollable %}</div>{% endif %}

From 063e69ecea00b3e6c9b2c39bd84870e6d6a24087 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Fri, 19 Nov 2021 13:53:04 -0500
Subject: [PATCH 02/87] [EPAD8-1493] add stacked tables

---
 .../03-uswds/table/table~stacked-header.yml   | 75 +++++++++++++++++++
 .../03-uswds/table/table~stacked.yml          | 75 +++++++++++++++++++
 2 files changed, 150 insertions(+)
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table~stacked-header.yml
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table~stacked.yml

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table~stacked-header.yml b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table~stacked-header.yml
new file mode 100644
index 0000000000..4dd2d28b9e
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table~stacked-header.yml
@@ -0,0 +1,75 @@
+sortable: true
+modifier_classes: 'usa-table--stacked-header'
+caption: 'Stacked Header table'
+header:
+  -
+    attributes: ' data-sortable scope="col"'
+    content: 'Document title'
+  -
+    attributes: ' data-sortable scope="col"'
+    content: 'Description'
+  -
+    attributes: ' data-sortable scope="col"'
+    content: 'Year'
+footer: false
+rows:
+  -
+    attributes: ''
+    cells:
+      -
+        tag: 'th'
+        attributes: ' scope="row"'
+        content: 'Declaration of Independence'
+      -
+        tag: 'td'
+        attributes: ''
+        content: 'Statement adopted by the Continental Congress declaring independence from the British Empire.'
+      -
+        tag: 'td'
+        attributes: ''
+        content: '1776'
+  -
+    attributes: ''
+    cells:
+      -
+        tag: 'th'
+        attributes: ' scope="row"'
+        content: 'Bill of Rights'
+      -
+        tag: 'td'
+        attributes: ''
+        content: 'The first ten amendments of the U.S. Constitution guaranteeing rights and freedoms.'
+      -
+        tag: 'td'
+        attributes: ''
+        content: '1791'
+  -
+    attributes: ''
+    cells:
+      -
+        tag: 'th'
+        attributes: ' scope="row"'
+        content: 'Declaration of Sentiments'
+      -
+        tag: 'td'
+        attributes: ''
+        content: 'A document written during the Seneca Falls Convention outlining the rights that American women should be entitled to as citizens.'
+      -
+        tag: 'td'
+        attributes: ''
+        content: '1848'
+  -
+    attributes: ''
+    cells:
+      -
+        tag: 'th'
+        attributes: ' scope="row"'
+        content: 'Emancipation Proclamation'
+      -
+        tag: 'td'
+        attributes: ''
+        content: 'An executive order granting freedom to slaves in designated southern states.'
+      -
+        tag: 'td'
+        attributes: ''
+        content: '1863'
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table~stacked.yml b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table~stacked.yml
new file mode 100644
index 0000000000..86f7950593
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/table~stacked.yml
@@ -0,0 +1,75 @@
+sortable: true
+modifier_classes: 'usa-table--stacked'
+caption: 'Stackable table'
+header:
+  -
+    attributes: ' data-sortable scope="col"'
+    content: 'Document title'
+  -
+    attributes: ' data-sortable scope="col"'
+    content: 'Description'
+  -
+    attributes: ' data-sortable scope="col"'
+    content: 'Year'
+footer: false
+rows:
+  -
+    attributes: ''
+    cells:
+      -
+        tag: 'th'
+        attributes: ' scope="row"'
+        content: 'Declaration of Independence'
+      -
+        tag: 'td'
+        attributes: ''
+        content: 'Statement adopted by the Continental Congress declaring independence from the British Empire.'
+      -
+        tag: 'td'
+        attributes: ''
+        content: '1776'
+  -
+    attributes: ''
+    cells:
+      -
+        tag: 'th'
+        attributes: ' scope="row"'
+        content: 'Bill of Rights'
+      -
+        tag: 'td'
+        attributes: ''
+        content: 'The first ten amendments of the U.S. Constitution guaranteeing rights and freedoms.'
+      -
+        tag: 'td'
+        attributes: ''
+        content: '1791'
+  -
+    attributes: ''
+    cells:
+      -
+        tag: 'th'
+        attributes: ' scope="row"'
+        content: 'Declaration of Sentiments'
+      -
+        tag: 'td'
+        attributes: ''
+        content: 'A document written during the Seneca Falls Convention outlining the rights that American women should be entitled to as citizens.'
+      -
+        tag: 'td'
+        attributes: ''
+        content: '1848'
+  -
+    attributes: ''
+    cells:
+      -
+        tag: 'th'
+        attributes: ' scope="row"'
+        content: 'Emancipation Proclamation'
+      -
+        tag: 'td'
+        attributes: ''
+        content: 'An executive order granting freedom to slaves in designated southern states.'
+      -
+        tag: 'td'
+        attributes: ''
+        content: '1863'

From ff5be99ca74b8ed292549a939d8a3c8bdf31438b Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Wed, 24 Nov 2021 10:53:24 -0500
Subject: [PATCH 03/87] [EPAD8-1493] removed overriding code for header styles

---
 .../source/_patterns/03-uswds/table/_table.scss          | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/_table.scss b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/_table.scss
index 8aefee038d..a4898015df 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/_table.scss
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/table/_table.scss
@@ -1,14 +1,5 @@
 @import 'elements/table';
 
-.usa-table {
-  tbody {
-    th {
-      background-color: color($theme-table-header-background-color);
-      font-weight: $theme-font-weight-bold;
-    }
-  }
-}
-
 .usa-table--borderless {
   tbody {
     th {

From b17c76248f6a74403e7ac6a40e951af17ae17360 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Wed, 24 Nov 2021 15:07:48 -0500
Subject: [PATCH 04/87] [EPAD8-1491] fix icon component, add icon list
 component

---
 .../03-uswds/icon-list/_icon-list.scss        |   4 +
 .../_patterns/03-uswds/icon-list/icon-list.md |  14 +
 .../03-uswds/icon-list/icon-list.twig         |  26 ++
 .../03-uswds/icon-list/icon-list.yml          |  21 ++
 .../03-uswds/icon-list/icon-list~large.yml    |   2 +
 .../03-uswds/icon-list/icon-list~primary.yml  |   2 +
 .../source/_patterns/03-uswds/icon/_icon.scss |   4 +
 .../source/_patterns/03-uswds/icon/icon.md    |  12 +
 .../source/_patterns/03-uswds/icon/icon.twig  | 266 ++++++++++++++++++
 .../source/_patterns/03-uswds/icon/icon.yml   |   6 +
 10 files changed, 357 insertions(+)
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/_icon-list.scss
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list.md
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list.twig
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list.yml
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list~large.yml
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list~primary.yml
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/_icon.scss
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/icon.md
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/icon.twig
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/icon.yml

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/_icon-list.scss b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/_icon-list.scss
new file mode 100644
index 0000000000..34f6ab30e4
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/_icon-list.scss
@@ -0,0 +1,4 @@
+// @file
+// Styles for icon list.
+
+@import 'components/icon-list';
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list.md b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list.md
new file mode 100644
index 0000000000..fd3fd2f892
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list.md
@@ -0,0 +1,14 @@
+---
+el: .usa-icon-list
+title: Icon List
+state: inreview
+---
+
+__Variables:__
+* modifier_classes: [string] Classes to modify the default component styling.
+* icon_modifier_classes: [string] Classes to modify internal icon component.
+* list: [array] List items. Each item is an object containing:
+  * content: [string] Content of the item.
+  * icon: [object] Icon object containing
+    * name: [string] Name of the icon.
+    * modifier_classes: [string] Classes to modify this individual icon.
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list.twig b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list.twig
new file mode 100644
index 0000000000..290bb6cb0f
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list.twig
@@ -0,0 +1,26 @@
+{% set classes = [
+  'usa-icon-list',
+  modifier_classes ? modifier_classes,
+]|join(' ')|trim %}
+
+<ul class="{{ classes }}">
+  {% for item in list %}
+    <li class="usa-icon-list__item">
+      {% if item.icon %}
+      <div class="usa-icon-list__icon">
+        {% set icon_classes = [
+          icon_modifier_classes ? icon_modifier_classes,
+          item.icon.modifier_classes ? item.icon.modifier_classes
+        ]|join(' ')|trim %}
+        {% include '@uswds/icon/icon.twig' with {
+          'icon_name': item.icon.name,
+          'modifier_classes': icon_classes,
+        } %}
+      </div>
+      {% endif %}
+      <div class="usa-icon-list__content">
+        {{ item.content }}
+      </div>
+    </li>
+  {% endfor %}
+</ul>
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list.yml b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list.yml
new file mode 100644
index 0000000000..7ba8ac9318
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list.yml
@@ -0,0 +1,21 @@
+---
+modifier_classes: ''
+icon_modifier_classes: ''
+list:
+  -
+    content: 'List Item One'
+    icon:
+      name: 'accessibility_new'
+      modifier_classes: ''
+  -
+    content: 'List Item Two'
+  -
+    content: 'List Item Three'
+    icon:
+      name: 'phone'
+      modifier_classes: ''
+  -
+    content: 'List Item Four'
+    icon:
+      name: 'check'
+      modifier_classes: 'text-green'
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list~large.yml b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list~large.yml
new file mode 100644
index 0000000000..6f3e714056
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list~large.yml
@@ -0,0 +1,2 @@
+---
+modifier_classes: 'usa-icon-list--size-lg'
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list~primary.yml b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list~primary.yml
new file mode 100644
index 0000000000..0074577c12
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list~primary.yml
@@ -0,0 +1,2 @@
+---
+modifier_classes: 'usa-icon-list--primary'
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/_icon.scss b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/_icon.scss
new file mode 100644
index 0000000000..c2ebc663f7
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/_icon.scss
@@ -0,0 +1,4 @@
+// @file
+// Styles for an icon.
+
+@import 'components/icon';
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/icon.md b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/icon.md
new file mode 100644
index 0000000000..eaca511205
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/icon.md
@@ -0,0 +1,12 @@
+---
+el: .usa-icon
+title: Icon
+state: inreview
+---
+
+__Variables:__
+* is_demo: [boolean] Whether to show extra examples for demo.
+* is_hidden: [boolean] Whether this icon has a role of aria-hidden.
+* label: [string] Label used for aria-label attribute.
+* modifier_classes: [string] Classes to modify the default component styling.
+* icon_name: [string] The icon image name in the icons.svg sprite.
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/icon.twig b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/icon.twig
new file mode 100644
index 0000000000..2690199df7
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/icon.twig
@@ -0,0 +1,266 @@
+{% set classes = [
+  'usa-icon',
+  modifier_classes ? modifier_classes,
+]|join(' ')|trim %}
+
+{% if is_demo %}
+  {% set icons = [
+    'accessibility_new',
+    'accessible_forward',
+    'account_balance',
+    'account_box',
+    'account_circle',
+    'add',
+    'add_circle',
+    'add_circle_outline',
+    'alarm',
+    'alternate_email',
+    'announcement',
+    'api',
+    'arrow_back',
+    'arrow_downward',
+    'arrow_drop_down',
+    'arrow_drop_up',
+    'arrow_forward',
+    'arrow_upward',
+    'assessment',
+    'attach_file',
+    'attach_money',
+    'autorenew',
+    'backpack',
+    'bathtub',
+    'bedding',
+    'bookmark',
+    'bug_report',
+    'build',
+    'calendar_today',
+    'campaign',
+    'camping',
+    'cancel',
+    'chat',
+    'check',
+    'check_box_outline_blank',
+    'check_circle',
+    'check_circle_outline',
+    'checkroom',
+    'chevron_left',
+    'chevron_right',
+    'clean_hands',
+    'close',
+    'closed_caption',
+    'clothes',
+    'cloud',
+    'code',
+    'comment',
+    'connect_without_contact',
+    'construction',
+    'construction_worker',
+    'contact_page',
+    'content_copy',
+    'coronavirus',
+    'credit_card',
+    'deck',
+    'delete',
+    'device_thermostat',
+    'directions',
+    'directions_bike',
+    'directions_bus',
+    'directions_car',
+    'directions_walk',
+    'do_not_disturb',
+    'do_not_touch',
+    'drag_handle',
+    'eco',
+    'edit',
+    'electrical_services',
+    'emoji_events',
+    'error',
+    'error_outline',
+    'event',
+    'expand_less',
+    'expand_more',
+    'facebook',
+    'fast_forward',
+    'fast_rewind',
+    'favorite',
+    'favorite_border',
+    'file_download',
+    'file_present',
+    'file_upload',
+    'filter_alt',
+    'filter_list',
+    'fingerprint',
+    'first_page',
+    'flag',
+    'flickr',
+    'flight',
+    'flooding',
+    'folder',
+    'folder_open',
+    'format_quote',
+    'format_size',
+    'forum',
+    'github',
+    'grid_view',
+    'group_add',
+    'groups',
+    'hearing',
+    'help',
+    'help_outline',
+    'highlight_off',
+    'history',
+    'home',
+    'hospital',
+    'hotel',
+    'hourglass_empty',
+    'hurricane',
+    'identification',
+    'image',
+    'info',
+    'info_outline',
+    'insights',
+    'instagram',
+    'keyboard',
+    'label',
+    'language',
+    'last_page',
+    'launch',
+    'lightbulb',
+    'lightbulb_outline',
+    'link',
+    'link_off',
+    'list',
+    'local_cafe',
+    'local_fire_department',
+    'local_gas_station',
+    'local_grocery_store',
+    'local_hospital',
+    'local_laundry_service',
+    'local_library',
+    'local_offer',
+    'local_parking',
+    'local_pharmacy',
+    'local_police',
+    'local_taxi',
+    'location_city',
+    'location_on',
+    'lock',
+    'lock_open',
+    'lock_outline',
+    'login',
+    'logout',
+    'loop',
+    'mail',
+    'mail_outline',
+    'map',
+    'masks',
+    'medical_services',
+    'menu',
+    'military_tech',
+    'more_horiz',
+    'more_vert',
+    'my_location',
+    'navigate_before',
+    'navigate_far_before',
+    'navigate_far_next',
+    'navigate_next',
+    'near_me',
+    'notifications',
+    'notifications_active',
+    'notifications_none',
+    'notifications_off',
+    'park',
+    'people',
+    'person',
+    'pets',
+    'phone',
+    'photo_camera',
+    'print',
+    'priority_high',
+    'public',
+    'push_pin',
+    'radio_button_unchecked',
+    'rain',
+    'reduce_capacity',
+    'remove',
+    'report',
+    'restaurant',
+    'rss_feed',
+    'safety_divider',
+    'sanitizer',
+    'save_alt',
+    'schedule',
+    'school',
+    'science',
+    'search',
+    'security',
+    'send',
+    'sentiment_dissatisfied',
+    'sentiment_neutral',
+    'sentiment_satisfied',
+    'sentiment_satisfied_alt',
+    'sentiment_very_dissatisfied',
+    'settings',
+    'severe_weather',
+    'share',
+    'shield',
+    'shopping_basket',
+    'snow',
+    'soap',
+    'social_distance',
+    'sort_arrow',
+    'spellcheck',
+    'star',
+    'star_half',
+    'star_outline',
+    'store',
+    'support',
+    'support_agent',
+    'text_fields',
+    'thumb_down_alt',
+    'thumb_up_alt',
+    'timer',
+    'toggle_off',
+    'toggle_on',
+    'topic',
+    'tornado',
+    'translate',
+    'trending_down',
+    'trending_up',
+    'twitter',
+    'undo',
+    'unfold_less',
+    'unfold_more',
+    'update',
+    'upload_file',
+    'verified',
+    'verified_user',
+    'visibility',
+    'visibility_off',
+    'volume_off',
+    'warning',
+    'wash',
+    'wifi',
+    'work',
+    'youtube',
+    'zoom_in',
+    'zoom_out',
+    'zoom_out_map',
+   ] %}
+  {% for icon in icons %}
+    <p>
+      <svg class="{{ classes }}"{% if is_hidden %} aria-hidden="true"{% endif %}{% if label %} role="img"{% endif %}>
+        {% if label %}<title>{{ label }}</title>{% endif %}
+        <use xlink:href="{{ epa_theme_image_path }}sprite.svg#{{ icon }}"></use>
+      </svg>
+      {{ icon }}
+    </p>
+  {% endfor %}
+{%- else -%}
+  {% spaceless %}
+    <svg class="{{ classes }}"{% if is_hidden %} aria-hidden="true"{% endif %}{% if label %} role="img"{% endif %}>
+      {% if label %}<title>{{ label }}</title>{% endif %}
+      <use xlink:href="{{ epa_theme_image_path }}sprite.svg#{{ icon_name }}"></use>
+    </svg>
+  {% endspaceless %}
+{%- endif -%}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/icon.yml b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/icon.yml
new file mode 100644
index 0000000000..042ba1cc64
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/icon.yml
@@ -0,0 +1,6 @@
+---
+is_demo: true
+is_hidden: false
+label: ''
+modifier_classes: ''
+icon_name: ''

From 41212e94a387735394353f9dace761da6359bdbb Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Sun, 5 Dec 2021 17:52:08 -0500
Subject: [PATCH 05/87] [EPAD8-1492] Add USWDS Modal to components

---
 .../_patterns/03-uswds/modal/_modal.scss      | 15 ++++++
 .../source/_patterns/03-uswds/modal/modal.md  | 14 ++++++
 .../_patterns/03-uswds/modal/modal.twig       | 46 +++++++++++++++++++
 .../source/_patterns/03-uswds/modal/modal.yml | 22 +++++++++
 .../_patterns/03-uswds/modal/modal~force.yml  | 24 ++++++++++
 .../_patterns/03-uswds/modal/modal~large.yml  |  3 ++
 6 files changed, 124 insertions(+)
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/_modal.scss
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal.md
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal.twig
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal.yml
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal~force.yml
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal~large.yml

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/_modal.scss b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/_modal.scss
new file mode 100644
index 0000000000..6d5dacae7e
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/_modal.scss
@@ -0,0 +1,15 @@
+.usa-modal {
+  .usa-modal__close {
+    align-items: center;
+    align-self: flex-end;
+    background-color: transparent;
+    color: #757575;
+    display: flex;
+    flex-shrink: 0;
+    font-size: 0.93rem;
+    margin: -2rem 0 0 auto;
+    padding: 0.25rem;
+    width: auto;
+  }
+
+}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal.md b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal.md
new file mode 100644
index 0000000000..9d587f9847
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal.md
@@ -0,0 +1,14 @@
+---
+el: .usa-modal
+title: Modal
+state: inreview
+---
+
+__Variables:__
+* modifier_classes: [string] Modifying classes for the component
+* modal_id: [string] ID for modal identification, needs to be unique to page.
+* button_text: [string] Label for modal activating button.
+* modal_header: [string] Text in modal header.
+* modal_description: [string] Text for modal body.
+* modal_footer: [string] Modal footer markup. Buttons require a `data-close-modal` attribute to function.
+* modal_force_action: [boolean] Flag to force a click in the footer actions.
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal.twig b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal.twig
new file mode 100644
index 0000000000..88b8c00955
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal.twig
@@ -0,0 +1,46 @@
+{% set classes = [
+  'usa-modal',
+  modifier_classes ? modifier_classes,
+]|join(' ')|trim %}
+
+<a
+  href="#{{ modal_id }}"
+  class="usa-button"
+  aria-controls="{{ modal_id }}"
+  data-open-modal
+>{{ button_text }}</a
+>
+<div
+  class="{{ classes }}"
+  id="{{ modal_id }}"
+  aria-labelledby="{{ modal_id }}-heading"
+  aria-describedby="{{ modal_id }}-description"
+  {% if modal_force_action %}data-force-action{% endif %}
+>
+  <div class="usa-modal__content">
+    <div class="usa-modal__main">
+      <h2 class="usa-modal__heading" id="{{ modal_id }}-heading">
+        {{ modal_header }}
+      </h2>
+      <div class="usa-prose">
+        <p id="{{ modal_id }}-description">
+          {{ modal_description }}
+        </p>
+      </div>
+      <div class="usa-modal__footer">
+        {{ modal_footer }}
+      </div>
+    </div>
+    {% if not modal_force_action %}
+    <button
+      class="usa-button usa-button--unstyled usa-modal__close"
+      aria-label="Close this window"
+      data-close-modal
+    >
+      <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+        <use xlink:href="{{ epa_theme_image_path }}sprite.svg#close"></use>
+      </svg>
+    </button>
+    {% endif %}
+  </div>
+</div>
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal.yml b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal.yml
new file mode 100644
index 0000000000..e29443e449
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal.yml
@@ -0,0 +1,22 @@
+modifier_classes: ''
+modal_id: 'example-modal'
+button_text: 'Open Default Modal'
+modal_header: 'Are you sure you want to continue?'
+modal_description: 'You have unsaved changes that will be lost.'
+modal_footer: |-
+  <ul class="usa-button-group">
+    <li class="usa-button-group__item">
+      <button type="button" class="usa-button" data-close-modal>
+        Continue without saving
+      </button>
+    </li>
+    <li class="usa-button-group__item">
+      <button
+        type="button"
+        class="usa-button usa-button--unstyled padding-105 text-center"
+        data-close-modal
+      >
+        Go back
+      </button>
+    </li>
+  </ul>
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal~force.yml b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal~force.yml
new file mode 100644
index 0000000000..6868c5041a
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal~force.yml
@@ -0,0 +1,24 @@
+modifier_classes: ''
+modal_id: 'example-modal-3'
+button_text: 'Open Force Action Modal'
+modal_force_action: true
+modal_header: 'Your session will end soon.'
+modal_description: |-
+  You’ve been inactive for too long. Please choose to stay signed in or sign out. Otherwise, you’ll be signed out automatically in 5 minutes.
+modal_footer: |-
+  <ul class="usa-button-group">
+    <li class="usa-button-group__item">
+      <button type="button" class="usa-button" data-close-modal>
+        Yes, stay signed in
+      </button>
+    </li>
+    <li class="usa-button-group__item">
+      <button
+        type="button"
+        class="usa-button usa-button--unstyled padding-105 text-center"
+        data-close-modal
+      >
+        Sign out
+      </button>
+    </li>
+  </ul>
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal~large.yml b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal~large.yml
new file mode 100644
index 0000000000..cdff2c3d18
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/modal/modal~large.yml
@@ -0,0 +1,3 @@
+modifier_classes: 'usa-modal--lg'
+modal_id: 'example-modal-2'
+button_text: 'Open Large Modal'

From 91170553cb855c4c33f231b3e9bdcb917794d75f Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Tue, 7 Dec 2021 11:55:00 -0500
Subject: [PATCH 06/87] EPAD8-1491: Tweak USWDS icon markup

---
 .../source/_patterns/03-uswds/icon-list/icon-list.twig        | 3 ++-
 .../themes/epa_theme/source/_patterns/03-uswds/icon/icon.twig | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list.twig b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list.twig
index 290bb6cb0f..0f03031a52 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/icon-list.twig
@@ -10,11 +10,12 @@
       <div class="usa-icon-list__icon">
         {% set icon_classes = [
           icon_modifier_classes ? icon_modifier_classes,
-          item.icon.modifier_classes ? item.icon.modifier_classes
+          item.icon.modifier_classes ? item.icon.modifier_classes,
         ]|join(' ')|trim %}
         {% include '@uswds/icon/icon.twig' with {
           'icon_name': item.icon.name,
           'modifier_classes': icon_classes,
+          'is_hidden': true,
         } %}
       </div>
       {% endif %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/icon.twig b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/icon.twig
index 2690199df7..e22e35e364 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/icon.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/icon.twig
@@ -249,7 +249,7 @@
    ] %}
   {% for icon in icons %}
     <p>
-      <svg class="{{ classes }}"{% if is_hidden %} aria-hidden="true"{% endif %}{% if label %} role="img"{% endif %}>
+      <svg class="{{ classes }}"{% if is_hidden %} aria-hidden="true" role="img"{% endif %}>
         {% if label %}<title>{{ label }}</title>{% endif %}
         <use xlink:href="{{ epa_theme_image_path }}sprite.svg#{{ icon }}"></use>
       </svg>
@@ -258,7 +258,7 @@
   {% endfor %}
 {%- else -%}
   {% spaceless %}
-    <svg class="{{ classes }}"{% if is_hidden %} aria-hidden="true"{% endif %}{% if label %} role="img"{% endif %}>
+    <svg class="{{ classes }}"{% if is_hidden %} aria-hidden="true" role="img"{% endif %}>
       {% if label %}<title>{{ label }}</title>{% endif %}
       <use xlink:href="{{ epa_theme_image_path }}sprite.svg#{{ icon_name }}"></use>
     </svg>

From 6272209d109a5e821c96ca1b0374c930e87bb9c3 Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Tue, 7 Dec 2021 11:55:24 -0500
Subject: [PATCH 07/87] EPAD8-1491: Update name of EPA icon component

---
 .../epa_theme/source/_patterns/05-components/icon/icon.md       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/icon/icon.md b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/icon/icon.md
index 6309677e5b..ba4933ad0c 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/icon/icon.md
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/icon/icon.md
@@ -1,6 +1,6 @@
 ---
 el: .icon
-title: Icon
+title: EPA Icon
 state: complete
 ---
 

From 002e5e72243f791eecc8e25ca0bb09d71bcb89bc Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Tue, 7 Dec 2021 12:05:46 -0500
Subject: [PATCH 08/87] EPAD8-1491: Remove unnecessary Sass partials

---
 .../source/_patterns/03-uswds/icon-list/_icon-list.scss       | 4 ----
 .../epa_theme/source/_patterns/03-uswds/icon/_icon.scss       | 4 ----
 2 files changed, 8 deletions(-)
 delete mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/_icon-list.scss
 delete mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/_icon.scss

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/_icon-list.scss b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/_icon-list.scss
deleted file mode 100644
index 34f6ab30e4..0000000000
--- a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon-list/_icon-list.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-// @file
-// Styles for icon list.
-
-@import 'components/icon-list';
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/_icon.scss b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/_icon.scss
deleted file mode 100644
index c2ebc663f7..0000000000
--- a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/icon/_icon.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-// @file
-// Styles for an icon.
-
-@import 'components/icon';

From 4b2f26236d865e29f491a3476e51480d74836086 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Thu, 9 Dec 2021 11:28:49 -0500
Subject: [PATCH 09/87] [EPAD8-1556] remove component imports in favor of
 global

---
 .../source/_patterns/03-uswds/summary-box/_summary-box.scss     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/summary-box/_summary-box.scss b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/summary-box/_summary-box.scss
index 20891fb3f5..39f5a3a8b6 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/summary-box/_summary-box.scss
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/summary-box/_summary-box.scss
@@ -1,5 +1,3 @@
-@import 'components/summary-box';
-
 .usa-summary-box__body,
 .usa-summary-box__text {
   overflow: auto;

From 34a0bfa24a934aa08bdade9fef43a9e06a6b8aa0 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Thu, 9 Dec 2021 17:31:29 -0500
Subject: [PATCH 10/87] Revert "Temporarily disable paragraph entity embedding"

This reverts commit af13b92145a8c2719195d2ed8d2181af55f463db.
---
 .../drupal/config/sync/editor.editor.filtered_html.yml     | 1 +
 .../drupal/config/sync/filter.format.filtered_html.yml     | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/services/drupal/config/sync/editor.editor.filtered_html.yml b/services/drupal/config/sync/editor.editor.filtered_html.yml
index 084aeb8f0c..58e9dad932 100644
--- a/services/drupal/config/sync/editor.editor.filtered_html.yml
+++ b/services/drupal/config/sync/editor.editor.filtered_html.yml
@@ -57,6 +57,7 @@ settings:
         -
           name: Embed
           items:
+            - paragraphs
             - DrupalMediaLibrary
             - DrupalInlineMedia
             - Iframe
diff --git a/services/drupal/config/sync/filter.format.filtered_html.yml b/services/drupal/config/sync/filter.format.filtered_html.yml
index fd7ab45e94..2fa2f5eddc 100644
--- a/services/drupal/config/sync/filter.format.filtered_html.yml
+++ b/services/drupal/config/sync/filter.format.filtered_html.yml
@@ -16,6 +16,7 @@ dependencies:
     - linkit
     - media
     - media_inline_embed
+    - paragraphs_entity_embed
     - pathologic
     - token_filter
 name: 'Filtered HTML'
@@ -148,3 +149,9 @@ filters:
     status: true
     weight: -42
     settings: {  }
+  paragraphs_entity_embed:
+    id: paragraphs_entity_embed
+    provider: paragraphs_entity_embed
+    status: true
+    weight: 0
+    settings: {  }

From 59e202bbdda9d28143f98a92fe771348b9d99f4e Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Fri, 10 Dec 2021 10:31:04 -0800
Subject: [PATCH 11/87] [EPAD8-1558] Add Latest revision and update button text

---
 ...sion-language-to-match-3252521-2899719-3252540-2.patch | 2 +-
 .../web/modules/custom/epa_workflow/epa_workflow.module   | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/services/drupal/patches/diff-patch-revision-language-to-match-3252521-2899719-3252540-2.patch b/services/drupal/patches/diff-patch-revision-language-to-match-3252521-2899719-3252540-2.patch
index 78561803f6..83f6672efa 100644
--- a/services/drupal/patches/diff-patch-revision-language-to-match-3252521-2899719-3252540-2.patch
+++ b/services/drupal/patches/diff-patch-revision-language-to-match-3252521-2899719-3252540-2.patch
@@ -50,7 +50,7 @@ index 45c2c66..b78dd8f 100755
 +            if ($revert_permission && !$revision->isLatestRevision()) {
                $links['revert'] = [
 -                'title' => $vid < $node->getRevisionId() ? $this->t('Revert') : $this->t('Set as current revision'),
-+                'title' => $this->t('Copy: Set as Latest Revision'),
++                'title' => $this->t('Copy and Set as Latest Revision'),
                  'url' => $has_translations ?
                    Url::fromRoute('node.revision_revert_translation_confirm', ['node' => $node->id(), 'node_revision' => $vid, 'langcode' => $langcode]) :
                    Url::fromRoute('node.revision_revert_confirm', ['node' => $node->id(), 'node_revision' => $vid]),
diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
index fe43e08a04..58f1f6dd6c 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
@@ -616,3 +616,11 @@ function epa_workflow_module_implements_alter(&$implementations, $hook) {
     unset($implementations['scheduled_publish']);
   }
 }
+
+/**
+ * Implements hook_form_alter().
+ */
+function epa_workflow_form_revision_overview_form_alter(&$form, FormStateInterface $form_state, $form_id) {
+  $form['node_revisions_table'][0]['operations']['#prefix'] = '<strong>Latest revision</strong><br>';
+}
+

From fb824830a31002956113bb00cd1dbfc1f18547ff Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Fri, 10 Dec 2021 12:19:45 -0800
Subject: [PATCH 12/87] [EPAD8-1558] update current revision button text

---
 ...h-revision-language-to-match-3252521-2899719-3252540-2.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/drupal/patches/diff-patch-revision-language-to-match-3252521-2899719-3252540-2.patch b/services/drupal/patches/diff-patch-revision-language-to-match-3252521-2899719-3252540-2.patch
index 83f6672efa..982622da6a 100644
--- a/services/drupal/patches/diff-patch-revision-language-to-match-3252521-2899719-3252540-2.patch
+++ b/services/drupal/patches/diff-patch-revision-language-to-match-3252521-2899719-3252540-2.patch
@@ -28,7 +28,7 @@ index 45c2c66..b78dd8f 100755
 +            $links = [];
 +            if ($revert_permission && !$revision->isLatestRevision()) {
 +              $links['revert'] = [
-+                'title' => $this->t('Copy: Set as Latest Revision'),
++                'title' => $this->t('Copy and Set as Latest Revision'),
 +                'url' => $has_translations ?
 +                  Url::fromRoute('node.revision_revert_translation_confirm', ['node' => $node->id(), 'node_revision' => $vid, 'langcode' => $langcode]) :
 +                  Url::fromRoute('node.revision_revert_confirm', ['node' => $node->id(), 'node_revision' => $vid]),

From 7b8a92358615d015ea05e65bab674dd9be000781 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Fri, 10 Dec 2021 16:05:00 -0500
Subject: [PATCH 13/87] [EPAD8-1560] add standalone template

---
 .../epa_theme/source/_data/menu--main.yml     | 249 +++++++++++++++++-
 .../themes/epa_theme/source/_meta/_foot.twig  |  27 +-
 .../themes/epa_theme/source/_meta/_head.twig  |  83 ++++++
 .../_patterns/07-pages/standalone-template.md |   4 +
 .../07-pages/standalone-template.twig         | 190 +++++++++++++
 .../07-pages/standalone-template.yml          |  64 +++++
 6 files changed, 605 insertions(+), 12 deletions(-)
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.md
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.twig
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml

diff --git a/services/drupal/web/themes/epa_theme/source/_data/menu--main.yml b/services/drupal/web/themes/epa_theme/source/_data/menu--main.yml
index 2834580f5d..feb6d0f3a1 100644
--- a/services/drupal/web/themes/epa_theme/source/_data/menu--main.yml
+++ b/services/drupal/web/themes/epa_theme/source/_data/menu--main.yml
@@ -2,30 +2,257 @@
 menu_name: 'main'
 main_items:
   - title: 'Environmental Topics'
-    url: 'https://www.epa.gov/environmental-topics'
+    url: '#'
     original_link:
       options:
         attributes:
           class: ''
     in_active_trail: false
+    below:
+      - title: 'Environmental Topics'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Air'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Bed Bugs'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Chemicals and Toxics'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Environmental Information by Location'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Greener Living'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Health'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Land, Waste, and Cleanup'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Lead'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Mold'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Pesticides'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Radon'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Science'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Water'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'A-Z Index'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
   - title: 'Laws &amp; Regulations'
-    url: 'https://www.epa.gov/laws-regulations'
-    original_link:
-      options:
-        attributes:
-          class: ''
-    in_active_trail: false
-  - title: 'Report a Violation'
-    url: 'https://www.epa.gov/report-violation'
+    url: '#'
     original_link:
       options:
         attributes:
           class: ''
     in_active_trail: false
+    below:
+      - title: 'Laws &amp; Regulations'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'By Business Sector'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'By Topic'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Compliance'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Enforcement'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Laws and Executive Orders'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Policy and Guidance'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Regulations'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
   - title: 'About EPA'
-    url: 'https://www.epa.gov/aboutepa'
+    url: '#'
     original_link:
       options:
         attributes:
           class: ''
-    in_active_trail: false
\ No newline at end of file
+    in_active_trail: false
+    below:
+      - title: 'About EPA'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'EPA Administrator'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Current Leadership'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Organization Chart'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Staff Directory'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Planning, Budget and Results'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Jobs and Internships'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Headquarters Offices'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Regional Offices'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
+      - title: 'Labs and Research Centers'
+        url: '#'
+        original_link:
+          options:
+            attributes:
+              class: ''
+        in_active_trail: false
diff --git a/services/drupal/web/themes/epa_theme/source/_meta/_foot.twig b/services/drupal/web/themes/epa_theme/source/_meta/_foot.twig
index ed74683717..10bd343fab 100644
--- a/services/drupal/web/themes/epa_theme/source/_meta/_foot.twig
+++ b/services/drupal/web/themes/epa_theme/source/_meta/_foot.twig
@@ -1,3 +1,4 @@
+{% if not standalone_template %}
 <script type="application/json" data-drupal-selector="drupal-settings-json">{}</script>
 <script src="../../../../../core/assets/vendor/jquery/jquery.min.js?v=2.2.4"></script>
 <script src="../../../../../core/assets/vendor/jquery-once/jquery.once.min.js?v=2.1.1"></script>
@@ -19,7 +20,31 @@
 <script src="../../../js/dist/toggle-admin.min.js?{{ cacheBuster }}"></script>
 <script src="../../../js/dist/definition.min.js?{{ cacheBuster }}"></script>
 <script src="../../../js/dist/external-links.min.js?{{ cacheBuster }}"></script>
-
+{% else %}
+{# Custom Standalone template head #}
+<script src="https://www.epa.gov/core/assets/vendor/jquery/jquery.min.js?v=3.6.0"></script>
+<script src="https://www.epa.gov/core/assets/vendor/css-escape/css.escape.js?v=1.5.1"></script>
+<script src="https://www.epa.gov/core/assets/vendor/jquery-once/jquery.once.min.js?v=2.2.3"></script>
+<script src="https://www.epa.gov/core/misc/drupalSettingsLoader.js?v=9.2.6"></script>
+<script src="https://www.epa.gov/core/misc/drupal.js?v=9.2.6"></script>
+<script src="https://www.epa.gov/core/misc/drupal.init.js?v=9.2.6"></script>
+<script src="https://www.epa.gov/core/assets/vendor/picturefill/picturefill.min.js?v=3.0.3"></script>
+<script src="https://www.epa.gov/core/assets/vendor/tabbable/index.umd.min.js?v=5.2.0"></script>
+<script src="https://www.epa.gov/modules/custom/epa_wysiwyg/js/plugins/epaNew/epaNew.js?r33yib"></script>
+<script src="https://www.epa.gov/themes/epa_theme/js/dist/common.min.js?v=9.2.6"></script>
+<script src="https://www.epa.gov/themes/epa_theme/js/dist/scripts.min.js?v=9.2.6"></script>
+<script src="https://www.epa.gov/themes/epa_theme/js/dist/sitewide-alert.min.js?v=9.2.6"></script>
+<script src="https://www.epa.gov/themes/epa_theme/js/dist/definition.min.js?v=9.2.6"></script>
+<script src="https://www.epa.gov/themes/epa_theme/js/dist/external-links.min.js?v=9.2.6"></script>
+<script src="https://www.epa.gov/themes/epa_theme/js/dist/media-link.min.js?v=9.2.6"></script>
+<script src="https://www.epa.gov/core/assets/vendor/jquery-form/jquery.form.min.js?v=4.3.0"></script>
+<script src="https://www.epa.gov/core/misc/progress.js?v=9.2.6"></script>
+<script src="https://www.epa.gov/core/modules/responsive_image/js/responsive_image.ajax.js?v=9.2.6"></script>
+<script src="https://www.epa.gov/core/misc/ajax.js?v=9.2.6"></script>
+<script src="https://www.epa.gov/core/themes/stable/js/ajax.js?v=9.2.6"></script>
+<script src="https://www.epa.gov/modules/contrib/views_ajax_get/views_ajax_get.js?r33yib"></script>
+<script src="https://www.epa.gov/modules/custom/epa_alerts/js/epaAlerts.js?r33yib" defer async></script>
+{% endif %}
 <!--DO NOT REMOVE-->
 {{ patternLabFoot | raw }}
 </body>
diff --git a/services/drupal/web/themes/epa_theme/source/_meta/_head.twig b/services/drupal/web/themes/epa_theme/source/_meta/_head.twig
index 12fc2ce455..a8e77efaeb 100644
--- a/services/drupal/web/themes/epa_theme/source/_meta/_head.twig
+++ b/services/drupal/web/themes/epa_theme/source/_meta/_head.twig
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html class="no-js pattern-lab-content {{ html_class }}" lang="en" dir="ltr">
 <head>
+  {% if not standalone_template %}
   <meta charset="utf-8">
   <meta name="MobileOptimized" content="width">
   <meta name="HandheldFriendly" content="true">
@@ -30,6 +31,88 @@
   <![endif]-->
 
   <link rel="stylesheet" href="../../../css/pattern-lab.css?{{ cacheBuster }}" media="all">
+  {% else %}
+  {# Custom Standalone template head #}
+  <meta charset="utf-8" />
+  <link rel="canonical" href="https://archive.epa.gov/" />
+  <link rel="shortlink" href="https://archive.epa.gov/" />
+  <meta name="description" content="This page provides access to older pages that the EPA has deemed historically relevant but no longer updated." />
+  <meta name="keywords" content="EPA, archive, web" />
+  <meta property="DC.title" content="US EPA Archives" />
+  <meta property="DC.description" content="This page provides access to older pages that the EPA has deemed historically relevant but no longer updated." />
+  <meta property="DC.Subject.epachannel" content="Learn the Issues" />
+  <meta property="DC.type" content="Overviews and Factsheets" />
+  <meta property="DC.date.created" content="2021-12-06" />
+  <meta property="DC.date.modified" content="2021-12-06" />
+  <meta property="DC.date.reviewed" content="2022-12-06" />
+  <meta property="DC.creator" content="US EPA,OA" />
+  <meta property="DC.language" content="en" />
+  <meta property="WebArea" content="Archive" />
+  <meta property="ContentType" content="Basic page" />
+  <meta property="og:site_name" content="US EPA" />
+  <meta property="og:type" content="website" />
+  <meta property="og:url" content="https://archive.epa.gov" />
+  <meta property="og:title" content="Archives | US EPA" />
+  <meta property="og:description" content="This page provides access to older pages that the EPA has deemed historically relevant but no longer updated." />
+  <meta property="og:image" content="https://www.epa.gov/sites/all/themes/epa/img/epa-standard-og.jpg" />
+  <meta property="og:image:width" content="1200" />
+  <meta property="og:image:height" content="630" />
+  <meta property="og:updated_time" content="2021-12-06" />
+  <meta property="og:image:alt" content="U.S. Environmental Protection Agency" />
+  <meta property="og:country_name" content="United States of America" />
+  <meta property="article:published_time" content="2021-12-06T00:00:00-05:00" />
+  <meta property="article:modified_time" content="2021-12-06" />
+  <meta name="twitter:card" content="summary_large_image" />
+  <meta name="twitter:image:alt" content="U.S. Environmental Protection Agency" />
+  <meta name="twitter:image:height" content="600" />
+  <meta name="twitter:image:width" content="1200" />
+  <meta name="twitter:image" content="https://www.epa.gov/sites/all/themes/epa/img/epa-standard-twitter.jpg" />
+  <meta name="MobileOptimized" content="width" />
+  <meta name="HandheldFriendly" content="true" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta http-equiv="x-ua-compatible" content="ie=edge" />
+
+  <title>Archives | US EPA</title>
+  <link rel="icon" type="image/x-icon" href="https://www.epa.gov/themes/epa_theme/images/favicon.ico">
+  <meta name="msapplication-TileColor" content="#FFFFFF">
+  <meta name="msapplication-TileImage" content="https://www.epa.gov/themes/epa_theme/images/favicon-144.png">
+  <meta name="application-name" content="">
+  <meta name="msapplication-config" content="https://www.epa.gov/themes/epa_theme/images/ieconfig.xml">
+  <link rel="apple-touch-icon-precomposed" sizes="196x196" href="https://www.epa.gov/themes/epa_theme/images/favicon-196.png">
+  <link rel="apple-touch-icon-precomposed" sizes="152x152" href="https://www.epa.gov/themes/epa_theme/images/favicon-152.png">
+  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="https://www.epa.gov/themes/epa_theme/images/favicon-144.png">
+  <link rel="apple-touch-icon-precomposed" sizes="120x120" href="https://www.epa.gov/themes/epa_theme/images/favicon-120.png">
+  <link rel="apple-touch-icon-precomposed" sizes="114x114" href="https://www.epa.gov/themes/epa_theme/images/favicon-114.png">
+  <link rel="apple-touch-icon-precomposed" sizes="72x72" href="https://www.epa.gov/themes/epa_theme/images/favicon-72.png">
+  <link rel="apple-touch-icon-precomposed" href="https://www.epa.gov/themes/epa_theme/images/favicon-180.png">
+  <link rel="icon" href="https://www.epa.gov/themes/epa_theme/images/favicon-32.png" sizes="32x32">
+  <link rel="preload" href="https://www.epa.gov/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff2" as="font" crossorigin="anonymous">
+  <link rel="preload" href="https://www.epa.gov/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff2" as="font" crossorigin="anonymous">
+  <link rel="preload" href="https://www.epa.gov/themes/epa_theme/fonts/merriweather/Latin-Merriweather-Bold.woff2" as="font" crossorigin="anonymous">
+  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/ajax-progress.module.css" />
+  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/autocomplete-loading.module.css" />
+  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/js.module.css" />
+  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/sticky-header.module.css" />
+  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-counter.css" />
+  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-report-counters.css" />
+  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-report-general-info.css" />
+  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/tabledrag.module.css" />
+  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/tablesort.module.css" />
+  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/tree-child.module.css" />
+  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/filter/filter.caption.css" />
+  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/media/filter.caption.css" />
+  <link rel="stylesheet" media="all" href="https://www.epa.gov/modules/contrib/paragraphs/css/paragraphs.unpublished.css" />
+  <link rel="stylesheet" media="all" href="https://www.epa.gov/themes/epa_theme/css/styles.css" />
+  <link rel="stylesheet" media="all" href="https://www.epa.gov/themes/epa_theme/css-lib/colorbox.min.css" />
+
+  <!-- Google Tag Manager -->
+  <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+        new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+      j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+      'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+    })(window,document,'script','dataLayer','GTM-L8ZB');</script>
+  <!-- End Google Tag Manager -->
+  {% endif %}
 
   <!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
   {{ patternLabHead | raw }}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.md b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.md
new file mode 100644
index 0000000000..3c93e3b311
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.md
@@ -0,0 +1,4 @@
+---
+title: Standalone Template
+state: inreview
+---
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.twig
new file mode 100644
index 0000000000..108e9ce20b
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.twig
@@ -0,0 +1,190 @@
+{% include '@uswds/banner/banner.twig' with {
+  'banner_text': 'An official website of the United States government',
+  'has_expanded': true,
+  'banner_action': 'Here’s how you know',
+  'expanded_blocks': [
+    {
+      'icon': '../../../images/icon-dot-gov.svg',
+      'icon_alt': 'Dot gov',
+      'heading': 'Official websites use .gov',
+      'content': 'A <strong>.gov</strong> website belongs to an official government organization in the United States.',
+    },
+    {
+      'icon': '../../../images/icon-https.svg',
+      'icon_alt': 'HTTPS',
+      'heading': 'Secure .gov websites use HTTPS',
+      'content': 'A <strong>lock</strong> (<span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" width="52" height="64" viewBox="0 0 52 64" class="usa-banner__lock-image" role="img" aria-labelledby="banner-lock-title banner-lock-description"><title id="banner-lock-title">Lock</title><desc id="banner-lock-description">A locked padlock</desc><path fill="#000000" fill-rule="evenodd" d="M26 0c10.493 0 19 8.507 19 19v9h3a4 4 0 0 1 4 4v28a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V32a4 4 0 0 1 4-4h3v-9C7 8.507 15.507 0 26 0zm0 8c-5.979 0-10.843 4.77-10.996 10.712L15 19v9h22v-9c0-6.075-4.925-11-11-11z"/></svg></span>) or <strong>https://</strong> means you’ve safely connected to the .gov website. Share sensitive information only on official, secure websites.',
+    },
+  ],
+} %}
+
+{% if show_sitewide_alerts %}
+  {% include '@components/site-alert/site-alert--emergency/site-alert--emergency.twig' with {
+    'show_close': false,
+    'content': '<p>This is an <strong>emergency</strong> alert.</p>',
+  } %}
+  {% include '@components/site-alert/site-alert.twig' with {
+    'show_close': true,
+    'hash': 'sample-alert-1',
+    'content': '<p>This is a <strong>warning</strong> alert.</p>',
+  } %}
+  {% include '@components/site-alert/site-alert--information/site-alert--information.twig' with {
+    'show_close': true,
+    'hash': 'sample-alert-2',
+    'content': '<p>We’ve made some changes to <a href="#">EPA.gov</a>. If the information you are looking for is not here, you may be able to find it on the <a href="https://archive.epa.gov/">EPA Web Archive</a> or the <a href="https://19january2017snapshot.epa.gov/">January 19, 2017 Web Snapshot</a>.</p>',
+  } %}
+{% endif %}
+
+{% embed '@layouts/header/header.twig' %}
+  {% block logo %}
+    {% include "@components/site-logo/site-logo.twig" with {
+      'url': '/',
+    } %}
+  {% endblock %}
+  {% block search %}
+    {% include '@components/search/search--epa/search--epa.twig' %}
+    {% if show_admin_info %}
+      {% include '@components/_toggle-admin/toggle-admin.twig' with {
+        'modifier_classes': 'margin-top-1',
+      } %}
+    {% endif %}
+  {% endblock %}
+  {% block navigation %}
+    {% embed '@components/nav/nav--epa/nav--epa.twig' with {
+      'label': 'Primary navigation',
+      'extended': true
+    } %}
+      {% block menu %}
+        {% include '@components/menu/menu--main/menu--main.twig' with {
+          'main_items': main_sl_items
+        } %}
+      {% endblock %}
+    {% endembed %}
+  {% endblock %}
+{% endembed %}
+
+<main id="main" class="main" role="main" tabindex="-1">
+  {{ content }}
+</main>
+
+{% embed '@components/footer/footer.twig' %}
+  {% block content %}
+    <div class="footer__column">
+      <h2>Discover.</h2>
+      {% include '@components/menu/menu--footer/menu--footer.twig' with {
+        'menu_name': 'footer',
+        'items': [
+          {
+            'title': 'Accessibility',
+            'url': 'https://www.epa.gov/accessibility',
+          },
+          {
+            'title': 'Budget & Performance',
+            'url': 'https://www.epa.gov/planandbudget',
+          },
+          {
+            'title': 'Contracting',
+            'url': 'https://www.epa.gov/contracts',
+          },
+          {
+            'title': 'EPA www Web Snapshots',
+            'url': 'https://www.epa.gov/home/wwwepagov-snapshots',
+          },
+          {
+            'title': 'Grants',
+            'url': 'https://www.epa.gov/grants',
+          },
+          {
+            'title': 'No FEAR Act Data',
+            'url': 'https://www.epa.gov/ocr/whistleblower-protections-epa-and-how-they-relate-non-disclosure-agreements-signed-epa-employees',
+          },
+          {
+            'title': 'Privacy',
+            'url': 'https://www.epa.gov/privacy',
+          },
+          {
+            'title': 'Privacy and Security Notice',
+            'url': 'https://www.epa.gov/privacy/privacy-and-security-notice',
+          },
+        ],
+      } %}
+    </div>
+    <div class="footer__column">
+      <h2>Connect.</h2>
+      {% include '@components/menu/menu--footer/menu--footer.twig' with {
+        'menu_name': 'footer',
+        'items': [
+          {
+            'title': 'Data.gov',
+            'url': 'https://www.data.gov/',
+          },
+          {
+            'title': 'Inspector General',
+            'url': 'https://www.epa.gov/office-inspector-general/about-epas-office-inspector-general',
+          },
+          {
+            'title': 'Jobs',
+            'url': 'https://www.epa.gov/careers',
+          },
+          {
+            'title': 'Newsroom',
+            'url': 'https://www.epa.gov/newsroom',
+          },
+          {
+            'title': 'Open Government',
+            'url': 'https://www.epa.gov/data',
+          },
+          {
+            'title': 'Regulations.gov',
+            'url': 'https://www.regulations.gov/',
+          },
+          {
+            'title': 'Subscribe',
+            'url': 'https://www.epa.gov/newsroom/email-subscriptions-epa-news-releases',
+          },
+          {
+            'title': 'USA.gov',
+            'url': 'https://www.usa.gov/',
+          },
+          {
+            'title': 'White House',
+            'url': 'https://www.whitehouse.gov/',
+           },
+        ],
+      } %}
+    </div>
+    <div class="footer__column">
+      <h2>Ask.</h2>
+      {% include '@components/menu/menu--footer/menu--footer.twig' with {
+        'menu_name': 'footer',
+        'items': [
+          {
+            'title': 'Contact EPA',
+            'url': 'https://www.epa.gov/aboutepa/forms/contact-epa',
+          },
+          {
+            'title': 'EPA Disclaimers',
+            'url': 'https://www.epa.gov/web-policies-and-procedures/epa-disclaimers',
+          },
+          {
+            'title': 'Hotlines',
+            'url': 'https://www.epa.gov/aboutepa/epa-hotlines',
+          },
+          {
+            'title': 'FOIA Requests',
+            'url': 'https://www.epa.gov/foia',
+           },
+          {
+            'title': 'Frequent Questions',
+            'url': 'https://www.epa.gov/aboutepa/frequent-questions-specific-epa-programstopics',
+           },
+        ],
+      } %}
+      <h2>Follow.</h2>
+      {% include '@components/menu/menu--social/menu--social.twig' %}
+      <p class="footer__last-updated">Last updated on September 15, 2021</p>
+    </div>
+  {% endblock %}
+{% endembed %}
+
+{% include '@components/back-to-top/back-to-top.twig' %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml
new file mode 100644
index 0000000000..eccbf68be5
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml
@@ -0,0 +1,64 @@
+standalone_template: true
+main_sl_items:
+  - title: 'Environmental Topics'
+    url: 'https://www.epa.gov/environmental-topics'
+    original_link:
+      options:
+        attributes:
+          class: ''
+    in_active_trail: false
+  - title: 'Laws &amp; Regulations'
+    url: 'https://www.epa.gov/laws-regulations'
+    original_link:
+      options:
+        attributes:
+          class: ''
+    in_active_trail: false
+  - title: 'Report a Violation'
+    url: 'https://www.epa.gov/report-violation'
+    original_link:
+      options:
+        attributes:
+          class: ''
+    in_active_trail: false
+  - title: 'About EPA'
+    url: 'https://www.epa.gov/aboutepa'
+    original_link:
+      options:
+        attributes:
+          class: ''
+    in_active_trail: false
+content: |-
+  <div class="l-page  has-footer">
+  <div class="l-constrain">
+  <div class="l-page__header">
+  <div class="l-page__header-first">
+  <div class="web-area-title">EPA Web Archives</div>
+  </div>
+  </div>
+  <article class="article">
+  <h1 class="page-title">EPA Web Archives &mdash; Home</h1>
+  <div class="main">
+  <p>Content in EPA's Web Archive is no longer being updated and links may not function; however, the materials in this archive may be useful as background documents to supplement current information or to provide a historical perspective on a topic.</p>
+  <ul>
+  <li>For current information, visit <a href="https://www.epa.gov/">www.epa.gov</a>.</li>
+  <li>For snapshot information, visit <a href="https://snapshot.epa.gov">snapshot.epa.gov</a>.</li>
+  </ul>
+
+  <form class="usa-search usa-search--big" action="https://search.epa.gov/epasearch" method="get">
+  <div role="search">
+  <label class="usa-sr-only" for="search-field-big">You can also search our archive. What are you looking for?</label>
+  <input class="usa-input" id="search-field-big" type="search" name="querytext" size="40" type="text" value="" placeholder="Search archive.epa.gov" />
+  <input name="inmeta" type="hidden" value="specialcollection_s~EPA+Archive" />
+  <input name="typeofsearch" type="hidden" value="epa" />
+  <input name="result_template" type="hidden" value="archive.ftl" />
+  <button class="usa-button" type="submit">
+  <span class="usa-search__submit-text">Search</span>
+  </button>
+  </div>
+  </form>
+  <hr>
+  </div>
+  </article>
+  </div>
+  </div>

From e76b45ae09f11d2d65e5c002fe45dcf0b4ee80db Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Mon, 13 Dec 2021 11:09:01 -0800
Subject: [PATCH 14/87] [EPAD8-1558] Add form alter for submit button text

---
 .../web/modules/custom/epa_workflow/epa_workflow.module     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
index 58f1f6dd6c..68ee06ef1d 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
@@ -624,3 +624,9 @@ function epa_workflow_form_revision_overview_form_alter(&$form, FormStateInterfa
   $form['node_revisions_table'][0]['operations']['#prefix'] = '<strong>Latest revision</strong><br>';
 }
 
+/**
+ * Implements hook_form_alter().
+ */
+function epa_workflow_form_node_revision_revert_confirm_alter(&$form, FormStateInterface $form_state, $form_id) {
+  $form['actions']['submit']['#value'] = 'Copy and Set as Latest Revision';
+}

From a2da91692c0851ff0359ab8a93efbd57fcab7c4c Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Tue, 14 Dec 2021 11:18:57 -0500
Subject: [PATCH 15/87] EPAD8-1556: Remove USWDS button @import

---
 .../source/_patterns/00-config/01-mixins/_mixins.button.scss   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/00-config/01-mixins/_mixins.button.scss b/services/drupal/web/themes/epa_theme/source/_patterns/00-config/01-mixins/_mixins.button.scss
index 96e8a4cfb3..178307773c 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/00-config/01-mixins/_mixins.button.scss
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/00-config/01-mixins/_mixins.button.scss
@@ -1,7 +1,6 @@
 // @file
 // Button styles
-@import 'packages/required';
-@import 'packages/usa-button';
+
 $button-border-radius: radius($theme-button-border-radius) !default;
 $button-background-color: gesso-color(button, primary, background) !default;
 $button-background-color-active: gesso-color(

From b417347626b311734d61731998da3d54743e0d64 Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Tue, 14 Dec 2021 11:25:56 -0500
Subject: [PATCH 16/87] EPAD8-1556: Fix typo in margins for checkboxes and
 radios

---
 .../form-item/form-item--checkboxes/_form-item--checkboxes.scss | 2 +-
 .../form-item/form-item--radios/_form-item--radios.scss         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/form-item/form-item--checkboxes/_form-item--checkboxes.scss b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/form-item/form-item--checkboxes/_form-item--checkboxes.scss
index dbbdb462fc..da1bf7653b 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/form-item/form-item--checkboxes/_form-item--checkboxes.scss
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/form-item/form-item--checkboxes/_form-item--checkboxes.scss
@@ -2,5 +2,5 @@
 // Styles for checkboxes form item.
 
 .form-item--checkboxes {
-  margin: rem(gesso-spacing(0.5)) 0;
+  margin: rem(gesso-spacing('05')) 0;
 }
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/form-item/form-item--radios/_form-item--radios.scss b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/form-item/form-item--radios/_form-item--radios.scss
index b72edfb09e..ec39804618 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/form-item/form-item--radios/_form-item--radios.scss
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/form-item/form-item--radios/_form-item--radios.scss
@@ -2,5 +2,5 @@
 // Styles for radios form item.
 
 .form-item--radios {
-  margin: rem(gesso-spacing(0.5)) 0;
+  margin: rem(gesso-spacing('05')) 0;
 }

From 49c848cbe810af8feac1bd0a588d74b01630d5f0 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Tue, 14 Dec 2021 12:25:42 -0500
Subject: [PATCH 17/87] [EPAD8-1558] add spacing to first row, keep buttons
 inside table

---
 .../modules/custom/epa_workflow/css/revision-list.css    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/services/drupal/web/modules/custom/epa_workflow/css/revision-list.css b/services/drupal/web/modules/custom/epa_workflow/css/revision-list.css
index e8f25dbdd3..1d056f1216 100644
--- a/services/drupal/web/modules/custom/epa_workflow/css/revision-list.css
+++ b/services/drupal/web/modules/custom/epa_workflow/css/revision-list.css
@@ -9,4 +9,13 @@
 
 #edit-node-revisions-table .revision-latest .dropbutton-wrapper {
   font-weight: inherit;
+  min-width: 200px;
+}
+
+#edit-node-revisions-table tbody tr:first-child td {
+  padding-bottom: 3rem;
+}
+
+#edit-node-revisions-table .dropbutton .dropbutton-action > * {
+  white-space: normal;
 }

From 6d70764fe57464515e27d858237a515a38d0165c Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Tue, 14 Dec 2021 13:43:38 -0500
Subject: [PATCH 18/87] [EPAD8-1567] add check to make .gov.* and .mil.* links
 render as external

---
 .../drupal/web/themes/epa_theme/js/src/external-links.es6.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js b/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
index 9f591bbb86..02959b0c39 100644
--- a/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
+++ b/services/drupal/web/themes/epa_theme/js/src/external-links.es6.js
@@ -5,7 +5,7 @@ import Drupal from 'drupal';
   Drupal.behaviors.externalLinks = {
     attach(context, settings) {
       const externalLinks = context.querySelectorAll(
-        "a:not([href=''], [href*='.gov'], [href*='.mil'], [href^='#'], [href^='?'], [href^='/'], [href^='.'], [href^='javascript:'], [href^='mailto:'], [href^='tel:'], [href*='webcms-uploads-dev.s3.amazonaws.com'], [href*='webcms-uploads-stage.s3.amazonaws.com'], [href*='webcms-uploads-prod.s3.amazonaws.com'], [href*='webcms-uploads-qa.s3.amazonaws.com'])"
+        "a:not([href=''], [href$='.gov'], [href*='.gov/'], [href$='.mil'], [href*='.mil/'], [href^='#'], [href^='?'], [href^='/'], [href^='.'], [href^='javascript:'], [href^='mailto:'], [href^='tel:'], [href*='webcms-uploads-dev.s3.amazonaws.com'], [href*='webcms-uploads-stage.s3.amazonaws.com'], [href*='webcms-uploads-prod.s3.amazonaws.com'], [href*='webcms-uploads-qa.s3.amazonaws.com'])"
       );
       const translate = {
         en: ['Exit', 'Exit EPA website'],

From f6927afbcf6f1bf5f6345d872759a53d63543233 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Tue, 14 Dec 2021 13:45:24 -0500
Subject: [PATCH 19/87] [EPAD8-1567] change no-js CSS to show .gov.* and .mil.*
 links as external

---
 .../00-config/02-variables/_variables.external-urls.scss        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/00-config/02-variables/_variables.external-urls.scss b/services/drupal/web/themes/epa_theme/source/_patterns/00-config/02-variables/_variables.external-urls.scss
index 5fea334af9..88a7d2f64b 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/00-config/02-variables/_variables.external-urls.scss
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/00-config/02-variables/_variables.external-urls.scss
@@ -1 +1 @@
-$external-urls: ":not([href=''], [href*='.gov'], [href*='.mil'], [href^='#'], [href^='?'], [href^='/'], [href^='.'], [href^='javascript:'], [href^='mailto:'], [href^='tel:'], [href*='webcms-uploads-dev.s3.amazonaws.com'], [href*='webcms-uploads-stage.s3.amazonaws.com'], [href*='webcms-uploads-prod.s3.amazonaws.com'], [href*='webcms-uploads-qa.s3.amazonaws.com'])";
+$external-urls: ":not([href=''], [href$='.gov'], [href*='.gov/'], [href$='.mil'], [href*='.mil/'], [href^='#'], [href^='?'], [href^='/'], [href^='.'], [href^='javascript:'], [href^='mailto:'], [href^='tel:'], [href*='webcms-uploads-dev.s3.amazonaws.com'], [href*='webcms-uploads-stage.s3.amazonaws.com'], [href*='webcms-uploads-prod.s3.amazonaws.com'], [href*='webcms-uploads-qa.s3.amazonaws.com'])";

From 90f5c2a230c177f442d9a97dfae469c77e616967 Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Tue, 14 Dec 2021 13:47:11 -0500
Subject: [PATCH 20/87] EPAD8-1560: Update standalone template content to use
 Pattern Lab templates

---
 .../07-pages/standalone-template.twig         | 19 ++++++--
 .../07-pages/standalone-template.yml          | 43 +++++++------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.twig
index 108e9ce20b..3c10e81492 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.twig
@@ -38,7 +38,7 @@
 {% embed '@layouts/header/header.twig' %}
   {% block logo %}
     {% include "@components/site-logo/site-logo.twig" with {
-      'url': '/',
+      'url': 'https://www.epa.gov/',
     } %}
   {% endblock %}
   {% block search %}
@@ -49,6 +49,7 @@
       } %}
     {% endif %}
   {% endblock %}
+
   {% block navigation %}
     {% embed '@components/nav/nav--epa/nav--epa.twig' with {
       'label': 'Primary navigation',
@@ -56,15 +57,27 @@
     } %}
       {% block menu %}
         {% include '@components/menu/menu--main/menu--main.twig' with {
-          'main_items': main_sl_items
+          'main_items': standalone_main_items,
         } %}
       {% endblock %}
     {% endembed %}
   {% endblock %}
 {% endembed %}
 
+{% set header_info %}
+  {% include '@components/web-area-title/web-area-title.twig' with {
+    'text': 'EPA Web Archive',
+  } %}
+{% endset %}
+
 <main id="main" class="main" role="main" tabindex="-1">
-  {{ content }}
+  {% include '@templates/detail-pages/page.twig' with {
+    'title': page_title,
+    'messages': '',
+    'tasks': '',
+    'intro': '',
+    'body': content,
+  } %}
 </main>
 
 {% embed '@components/footer/footer.twig' %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml
index eccbf68be5..525e04190f 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/standalone-template.yml
@@ -1,5 +1,6 @@
 standalone_template: true
-main_sl_items:
+has_footer: false
+standalone_main_items:
   - title: 'Environmental Topics'
     url: 'https://www.epa.gov/environmental-topics'
     original_link:
@@ -28,37 +29,23 @@ main_sl_items:
         attributes:
           class: ''
     in_active_trail: false
+page_title: 'EPA Web Archives &mdash; Home'
 content: |-
-  <div class="l-page  has-footer">
-  <div class="l-constrain">
-  <div class="l-page__header">
-  <div class="l-page__header-first">
-  <div class="web-area-title">EPA Web Archives</div>
-  </div>
-  </div>
-  <article class="article">
-  <h1 class="page-title">EPA Web Archives &mdash; Home</h1>
-  <div class="main">
   <p>Content in EPA's Web Archive is no longer being updated and links may not function; however, the materials in this archive may be useful as background documents to supplement current information or to provide a historical perspective on a topic.</p>
   <ul>
-  <li>For current information, visit <a href="https://www.epa.gov/">www.epa.gov</a>.</li>
-  <li>For snapshot information, visit <a href="https://snapshot.epa.gov">snapshot.epa.gov</a>.</li>
+    <li>For current information, visit <a href="https://www.epa.gov/">www.epa.gov</a>.</li>
+    <li>For snapshot information, visit <a href="https://snapshot.epa.gov">snapshot.epa.gov</a>.</li>
   </ul>
 
   <form class="usa-search usa-search--big" action="https://search.epa.gov/epasearch" method="get">
-  <div role="search">
-  <label class="usa-sr-only" for="search-field-big">You can also search our archive. What are you looking for?</label>
-  <input class="usa-input" id="search-field-big" type="search" name="querytext" size="40" type="text" value="" placeholder="Search archive.epa.gov" />
-  <input name="inmeta" type="hidden" value="specialcollection_s~EPA+Archive" />
-  <input name="typeofsearch" type="hidden" value="epa" />
-  <input name="result_template" type="hidden" value="archive.ftl" />
-  <button class="usa-button" type="submit">
-  <span class="usa-search__submit-text">Search</span>
-  </button>
-  </div>
+    <div role="search">
+      <label class="usa-sr-only" for="search-field-big">You can also search our archive. What are you looking for?</label>
+      <input class="usa-input" id="search-field-big" type="search" name="querytext" size="40" type="text" value="" placeholder="Search archive.epa.gov" />
+      <input name="inmeta" type="hidden" value="specialcollection_s~EPA+Archive" />
+      <input name="typeofsearch" type="hidden" value="epa" />
+      <input name="result_template" type="hidden" value="archive.ftl" />
+      <button class="usa-button" type="submit">
+        <span class="usa-search__submit-text">Search</span>
+      </button>
+    </div>
   </form>
-  <hr>
-  </div>
-  </article>
-  </div>
-  </div>

From 27a2eb5dadc549ad3562162eaa5c6f090d558668 Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Tue, 14 Dec 2021 14:38:44 -0500
Subject: [PATCH 21/87] EPAD8-1560: Update <head> markup

---
 .../themes/epa_theme/source/_meta/_head.twig  | 190 ++++++++----------
 .../epa_theme/templates/layout/html.html.twig |   8 +-
 2 files changed, 90 insertions(+), 108 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_meta/_head.twig b/services/drupal/web/themes/epa_theme/source/_meta/_head.twig
index a8e77efaeb..0d83232a64 100644
--- a/services/drupal/web/themes/epa_theme/source/_meta/_head.twig
+++ b/services/drupal/web/themes/epa_theme/source/_meta/_head.twig
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html class="no-js pattern-lab-content {{ html_class }}" lang="en" dir="ltr">
 <head>
-  {% if not standalone_template %}
   <meta charset="utf-8">
   <meta name="MobileOptimized" content="width">
   <meta name="HandheldFriendly" content="true">
@@ -9,109 +8,96 @@
   <meta http-equiv="x-ua-compatible" content="ie=edge">
   <title>{{ page_title }} | {{ site_name }}</title>
 
-  <link rel="icon" type="image/x-icon" href="/themes/epa_theme/images/favicon.ico">
-  <meta name="msapplication-TileColor" content="#FFFFFF">
-  <meta name="msapplication-TileImage" content="/themes/epa_theme/images/favicon-144.png">
-  <meta name="application-name" content="{{ siteName }}">
-  <meta name="msapplication-config" content="/themes/epa_theme/images/ieconfig.xml">
-  <link rel="apple-touch-icon-precomposed" sizes="196x196" href="/themes/epa_theme/images/favicon-196.png">
-  <link rel="apple-touch-icon-precomposed" sizes="152x152" href="/themes/epa_theme/images/favicon-152.png">
-  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/themes/epa_theme/images/favicon-144.png">
-  <link rel="apple-touch-icon-precomposed" sizes="120x120" href="/themes/epa_theme/images/favicon-120.png">
-  <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/themes/epa_theme/images/favicon-114.png">
-  <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/themes/epa_theme/images/favicon-72.png">
-  <link rel="apple-touch-icon-precomposed" href="/themes/epa_theme/images/favicon-180.png">
-  <link rel="icon" href="/themes/epa_theme/images/favicon-32.png" sizes="32x32">
-
-  <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,400i,600,600i,700,700i&display=swap" rel="stylesheet">
-  <link rel="stylesheet" href="../../../css/styles.css?{{ cacheBuster }}" media="all">
-
-  <!--[if lte IE 8]>
-  <script src="../../../../../core/assets/vendor/html5shiv/html5shiv.min.js?v=3.7.3"></script>
-  <![endif]-->
-
-  <link rel="stylesheet" href="../../../css/pattern-lab.css?{{ cacheBuster }}" media="all">
+  {% if not standalone_template %}
+    <link rel="icon" type="image/x-icon" href="/themes/epa_theme/images/favicon.ico">
+    <meta name="msapplication-TileColor" content="#FFFFFF">
+    <meta name="msapplication-TileImage" content="/themes/epa_theme/images/favicon-144.png">
+    <meta name="application-name" content="{{ site_name }}">
+    <meta name="msapplication-config" content="/themes/epa_theme/images/ieconfig.xml">
+    <link rel="apple-touch-icon-precomposed" sizes="196x196" href="/themes/epa_theme/images/favicon-196.png">
+    <link rel="apple-touch-icon-precomposed" sizes="152x152" href="/themes/epa_theme/images/favicon-152.png">
+    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/themes/epa_theme/images/favicon-144.png">
+    <link rel="apple-touch-icon-precomposed" sizes="120x120" href="/themes/epa_theme/images/favicon-120.png">
+    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="/themes/epa_theme/images/favicon-114.png">
+    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="/themes/epa_theme/images/favicon-72.png">
+    <link rel="apple-touch-icon-precomposed" href="/themes/epa_theme/images/favicon-180.png">
+    <link rel="icon" href="/themes/epa_theme/images/favicon-32.png" sizes="32x32">
+    <link rel="preload" href="/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff2" as="font" crossorigin="anonymous">
+    <link rel="preload" href="/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff2" as="font" crossorigin="anonymous">
+    <link rel="preload" href="/themes/epa_theme/fonts/merriweather/Latin-Merriweather-Bold.woff2" as="font" crossorigin="anonymous">
+    <link rel="stylesheet" href="../../../css/styles.css?{{ cacheBuster }}" media="all">
+    <link rel="stylesheet" href="../../../css-lib/colorbox.min.css?{{ cacheBuster }}" media="all">
+    <link rel="stylesheet" href="../../../css/pattern-lab.css?{{ cacheBuster }}" media="all">
   {% else %}
-  {# Custom Standalone template head #}
-  <meta charset="utf-8" />
-  <link rel="canonical" href="https://archive.epa.gov/" />
-  <link rel="shortlink" href="https://archive.epa.gov/" />
-  <meta name="description" content="This page provides access to older pages that the EPA has deemed historically relevant but no longer updated." />
-  <meta name="keywords" content="EPA, archive, web" />
-  <meta property="DC.title" content="US EPA Archives" />
-  <meta property="DC.description" content="This page provides access to older pages that the EPA has deemed historically relevant but no longer updated." />
-  <meta property="DC.Subject.epachannel" content="Learn the Issues" />
-  <meta property="DC.type" content="Overviews and Factsheets" />
-  <meta property="DC.date.created" content="2021-12-06" />
-  <meta property="DC.date.modified" content="2021-12-06" />
-  <meta property="DC.date.reviewed" content="2022-12-06" />
-  <meta property="DC.creator" content="US EPA,OA" />
-  <meta property="DC.language" content="en" />
-  <meta property="WebArea" content="Archive" />
-  <meta property="ContentType" content="Basic page" />
-  <meta property="og:site_name" content="US EPA" />
-  <meta property="og:type" content="website" />
-  <meta property="og:url" content="https://archive.epa.gov" />
-  <meta property="og:title" content="Archives | US EPA" />
-  <meta property="og:description" content="This page provides access to older pages that the EPA has deemed historically relevant but no longer updated." />
-  <meta property="og:image" content="https://www.epa.gov/sites/all/themes/epa/img/epa-standard-og.jpg" />
-  <meta property="og:image:width" content="1200" />
-  <meta property="og:image:height" content="630" />
-  <meta property="og:updated_time" content="2021-12-06" />
-  <meta property="og:image:alt" content="U.S. Environmental Protection Agency" />
-  <meta property="og:country_name" content="United States of America" />
-  <meta property="article:published_time" content="2021-12-06T00:00:00-05:00" />
-  <meta property="article:modified_time" content="2021-12-06" />
-  <meta name="twitter:card" content="summary_large_image" />
-  <meta name="twitter:image:alt" content="U.S. Environmental Protection Agency" />
-  <meta name="twitter:image:height" content="600" />
-  <meta name="twitter:image:width" content="1200" />
-  <meta name="twitter:image" content="https://www.epa.gov/sites/all/themes/epa/img/epa-standard-twitter.jpg" />
-  <meta name="MobileOptimized" content="width" />
-  <meta name="HandheldFriendly" content="true" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta http-equiv="x-ua-compatible" content="ie=edge" />
-
-  <title>Archives | US EPA</title>
-  <link rel="icon" type="image/x-icon" href="https://www.epa.gov/themes/epa_theme/images/favicon.ico">
-  <meta name="msapplication-TileColor" content="#FFFFFF">
-  <meta name="msapplication-TileImage" content="https://www.epa.gov/themes/epa_theme/images/favicon-144.png">
-  <meta name="application-name" content="">
-  <meta name="msapplication-config" content="https://www.epa.gov/themes/epa_theme/images/ieconfig.xml">
-  <link rel="apple-touch-icon-precomposed" sizes="196x196" href="https://www.epa.gov/themes/epa_theme/images/favicon-196.png">
-  <link rel="apple-touch-icon-precomposed" sizes="152x152" href="https://www.epa.gov/themes/epa_theme/images/favicon-152.png">
-  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="https://www.epa.gov/themes/epa_theme/images/favicon-144.png">
-  <link rel="apple-touch-icon-precomposed" sizes="120x120" href="https://www.epa.gov/themes/epa_theme/images/favicon-120.png">
-  <link rel="apple-touch-icon-precomposed" sizes="114x114" href="https://www.epa.gov/themes/epa_theme/images/favicon-114.png">
-  <link rel="apple-touch-icon-precomposed" sizes="72x72" href="https://www.epa.gov/themes/epa_theme/images/favicon-72.png">
-  <link rel="apple-touch-icon-precomposed" href="https://www.epa.gov/themes/epa_theme/images/favicon-180.png">
-  <link rel="icon" href="https://www.epa.gov/themes/epa_theme/images/favicon-32.png" sizes="32x32">
-  <link rel="preload" href="https://www.epa.gov/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff2" as="font" crossorigin="anonymous">
-  <link rel="preload" href="https://www.epa.gov/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff2" as="font" crossorigin="anonymous">
-  <link rel="preload" href="https://www.epa.gov/themes/epa_theme/fonts/merriweather/Latin-Merriweather-Bold.woff2" as="font" crossorigin="anonymous">
-  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/ajax-progress.module.css" />
-  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/autocomplete-loading.module.css" />
-  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/js.module.css" />
-  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/sticky-header.module.css" />
-  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-counter.css" />
-  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-report-counters.css" />
-  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-report-general-info.css" />
-  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/tabledrag.module.css" />
-  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/tablesort.module.css" />
-  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/tree-child.module.css" />
-  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/filter/filter.caption.css" />
-  <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/media/filter.caption.css" />
-  <link rel="stylesheet" media="all" href="https://www.epa.gov/modules/contrib/paragraphs/css/paragraphs.unpublished.css" />
-  <link rel="stylesheet" media="all" href="https://www.epa.gov/themes/epa_theme/css/styles.css" />
-  <link rel="stylesheet" media="all" href="https://www.epa.gov/themes/epa_theme/css-lib/colorbox.min.css" />
+    {# Custom Standalone template head #}
+    <link rel="canonical" href="https://archive.epa.gov/">
+    <link rel="shortlink" href="https://archive.epa.gov/">
+    <meta name="description" content="This page provides access to older pages that the EPA has deemed historically relevant but no longer updated.">
+    <meta name="keywords" content="EPA, archive, web">
+    <meta property="DC.title" content="{{ page_title }}">
+    <meta property="DC.description" content="This page provides access to older pages that the EPA has deemed historically relevant but no longer updated.">
+    <meta property="DC.Subject.epachannel" content="Learn the Issues">
+    <meta property="DC.type" content="Overviews and Factsheets">
+    <meta property="DC.date.created" content="2021-12-06">
+    <meta property="DC.date.modified" content="2021-12-06">
+    <meta property="DC.date.reviewed" content="2022-12-06">
+    <meta property="DC.creator" content="US EPA,OA">
+    <meta property="DC.language" content="en">
+    <meta property="WebArea" content="Archive">
+    <meta property="ContentType" content="Basic page">
+    <meta property="og:site_name" content="US EPA">
+    <meta property="og:type" content="website">
+    <meta property="og:url" content="https://archive.epa.gov">
+    <meta property="og:title" content="{{ page_title }} | {{ site_name }}">
+    <meta property="og:description" content="This page provides access to older pages that the EPA has deemed historically relevant but no longer updated.">
+    <meta property="og:image" content="https://www.epa.gov/sites/all/themes/epa/img/epa-standard-og.jpg">
+    <meta property="og:image:width" content="1200">
+    <meta property="og:image:height" content="630">
+    <meta property="og:updated_time" content="2021-12-06">
+    <meta property="og:image:alt" content="U.S. Environmental Protection Agency">
+    <meta property="og:country_name" content="United States of America">
+    <meta property="article:published_time" content="2021-12-06T00:00:00-05:00">
+    <meta property="article:modified_time" content="2021-12-06">
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:image:alt" content="U.S. Environmental Protection Agency">
+    <meta name="twitter:image:height" content="600">
+    <meta name="twitter:image:width" content="1200">
+    <meta name="twitter:image" content="https://www.epa.gov/sites/all/themes/epa/img/epa-standard-twitter.jpg">
+    <link rel="icon" type="image/x-icon" href="https://www.epa.gov/themes/epa_theme/images/favicon.ico">
+    <meta name="msapplication-TileColor" content="#FFFFFF">
+    <meta name="msapplication-TileImage" content="https://www.epa.gov/themes/epa_theme/images/favicon-144.png">
+    <meta name="application-name" content="{{ site_name }}">
+    <meta name="msapplication-config" content="https://www.epa.gov/themes/epa_theme/images/ieconfig.xml">
+    <link rel="apple-touch-icon-precomposed" sizes="196x196" href="https://www.epa.gov/themes/epa_theme/images/favicon-196.png">
+    <link rel="apple-touch-icon-precomposed" sizes="152x152" href="https://www.epa.gov/themes/epa_theme/images/favicon-152.png">
+    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="https://www.epa.gov/themes/epa_theme/images/favicon-144.png">
+    <link rel="apple-touch-icon-precomposed" sizes="120x120" href="https://www.epa.gov/themes/epa_theme/images/favicon-120.png">
+    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="https://www.epa.gov/themes/epa_theme/images/favicon-114.png">
+    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="https://www.epa.gov/themes/epa_theme/images/favicon-72.png">
+    <link rel="apple-touch-icon-precomposed" href="https://www.epa.gov/themes/epa_theme/images/favicon-180.png">
+    <link rel="icon" href="https://www.epa.gov/themes/epa_theme/images/favicon-32.png" sizes="32x32">
+    <link rel="preload" href="https://www.epa.gov/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff2" as="font" crossorigin="anonymous">
+    <link rel="preload" href="https://www.epa.gov/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff2" as="font" crossorigin="anonymous">
+    <link rel="preload" href="https://www.epa.gov/themes/epa_theme/fonts/merriweather/Latin-Merriweather-Bold.woff2" as="font" crossorigin="anonymous">
+    <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/ajax-progress.module.css">
+    <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/autocomplete-loading.module.css">
+    <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/js.module.css">
+    <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/sticky-header.module.css">
+    <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-counter.css">
+    <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-report-counters.css">
+    <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-report-general-info.css">
+    <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/tabledrag.module.css">
+    <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/tablesort.module.css">
+    <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/system/components/tree-child.module.css">
+    <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/filter/filter.caption.css">
+    <link rel="stylesheet" media="all" href="https://www.epa.gov/core/themes/stable/css/media/filter.caption.css">
+    <link rel="stylesheet" media="all" href="https://www.epa.gov/modules/contrib/paragraphs/css/paragraphs.unpublished.css">
+    <link rel="stylesheet" media="all" href="https://www.epa.gov/themes/epa_theme/css/styles.css">
+    <link rel="stylesheet" media="all" href="https://www.epa.gov/themes/epa_theme/css-lib/colorbox.min.css">
 
-  <!-- Google Tag Manager -->
-  <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-        new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-      j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-      'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-    })(window,document,'script','dataLayer','GTM-L8ZB');</script>
-  <!-- End Google Tag Manager -->
+    <!-- Google Tag Manager -->
+    <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','GTM-L8ZB');</script>
+    <!-- End Google Tag Manager -->
   {% endif %}
 
   <!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
diff --git a/services/drupal/web/themes/epa_theme/templates/layout/html.html.twig b/services/drupal/web/themes/epa_theme/templates/layout/html.html.twig
index b0fff40859..8eeb54f5f9 100644
--- a/services/drupal/web/themes/epa_theme/templates/layout/html.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/layout/html.html.twig
@@ -39,7 +39,7 @@
     <link rel="icon" type="image/x-icon" href="/themes/epa_theme/images/favicon.ico">
     <meta name="msapplication-TileColor" content="#FFFFFF">
     <meta name="msapplication-TileImage" content="/themes/epa_theme/images/favicon-144.png">
-    <meta name="application-name" content="{{ siteName }}">
+    <meta name="application-name" content="{{ site_name }}">
     <meta name="msapplication-config" content="/themes/epa_theme/images/ieconfig.xml">
     <link rel="apple-touch-icon-precomposed" sizes="196x196" href="/themes/epa_theme/images/favicon-196.png">
     <link rel="apple-touch-icon-precomposed" sizes="152x152" href="/themes/epa_theme/images/favicon-152.png">
@@ -55,11 +55,7 @@
     <css-placeholder token="{{ placeholder_token|raw }}">
     <js-placeholder token="{{ placeholder_token|raw }}">
     <!-- Google Tag Manager -->
-    <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-          new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-        'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-      })(window,document,'script','dataLayer','GTM-L8ZB');</script>
+    <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','GTM-L8ZB');</script>
     <!-- End Google Tag Manager -->
   </head>
   <body{{ attributes.addClass(body_classes).setAttribute('id', body_id) }}>

From 2d9c0dac4e99717c1dedcaa7a432ba735a372fd7 Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Tue, 14 Dec 2021 16:02:17 -0500
Subject: [PATCH 22/87] EPAD8-1560: Update Pattern Lab foot template

---
 .../themes/epa_theme/source/_meta/_foot.twig  | 94 ++++++++++---------
 1 file changed, 50 insertions(+), 44 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_meta/_foot.twig b/services/drupal/web/themes/epa_theme/source/_meta/_foot.twig
index 10bd343fab..cea4e6100b 100644
--- a/services/drupal/web/themes/epa_theme/source/_meta/_foot.twig
+++ b/services/drupal/web/themes/epa_theme/source/_meta/_foot.twig
@@ -1,50 +1,56 @@
 {% if not standalone_template %}
-<script type="application/json" data-drupal-selector="drupal-settings-json">{}</script>
-<script src="../../../../../core/assets/vendor/jquery/jquery.min.js?v=2.2.4"></script>
-<script src="../../../../../core/assets/vendor/jquery-once/jquery.once.min.js?v=2.1.1"></script>
-<script src="../../../../../core/misc/drupalSettingsLoader.js?v=8.3.7"></script>
-<script src="../../../../../core/misc/drupal.js?v=8.3.7"></script>
-<script src="../../../../../core/misc/drupal.init.js?v=8.3.7"></script>
-<script src="../../../../../libraries/mediaelement/build/mediaelement-and-player.min.js?v=8.8.1"></script>
-<script src="../../../../../modules/contrib/mediaelement/js/mediaelement.bundle.js?v=8.8.1"></script>
-<script src="../../../js/overrides/collapse.js?{{ cacheBuster }}"></script>
-<script src="../../../js/overrides/dropbutton.js?{{ cacheBuster }}"></script>
-<script src="../../../js/libraries/details-element-polyfill.js?{{ cacheBuster }}"></script>
-<script src="../../../js/libraries/svgxuse.min.js?{{ cacheBuster }}"></script>
-<script src="../../../js/dist/common.min.js?{{ cacheBuster }}"></script>
-<script src="../../../js/dist/scripts.min.js?{{ cacheBuster }}"></script>
-<script src="../../../js/dist/hero-slideshow.min.js?{{ cacheBuster }}"></script>
-<script src="../../../js/dist/image-gallery.min.js?{{ cacheBuster }}"></script>
-<script src="../../../js/dist/media-link.min.js?{{ cacheBuster }}"></script>
-<script src="../../../js/dist/sitewide-alert.min.js?{{ cacheBuster }}"></script>
-<script src="../../../js/dist/toggle-admin.min.js?{{ cacheBuster }}"></script>
-<script src="../../../js/dist/definition.min.js?{{ cacheBuster }}"></script>
-<script src="../../../js/dist/external-links.min.js?{{ cacheBuster }}"></script>
+  <script type="application/json" data-drupal-selector="drupal-settings-json">{}</script>
+  <script src="../../../../../core/assets/vendor/jquery/jquery.min.js?v=3.6.0"></script>
+  <script src="../../../../../core/assets/vendor/css-escape/css.escape.js?v=1.5.1"></script>
+  <script src="../../../../../core/assets/vendor/jquery-once/jquery.once.min.js?v=2.2.3"></script>
+  <script src="../../../../../core/misc/drupalSettingsLoader.js?v=9.2.6"></script>
+  <script src="../../../../../core/misc/drupal.js?v=9.2.6"></script>
+  <script src="../../../../../core/misc/drupal.init.js?v=9.2.6"></script>
+  <script src="../../../../../core/assets/vendor/picturefill/picturefill.min.js?v=3.0.3"></script>
+  <script src="../../../../../core/assets/vendor/tabbable/index.umd.min.js?v=5.2.0"></script>
+  <script src="../../../../../modules/custom/epa_wysiwyg/js/plugins/epaNew/epaNew.js?{{ cacheBuster }}"></script>
+  <script src="../../../js/overrides/collapse.js?{{ cacheBuster }}"></script>
+  <script src="../../../js/overrides/dropbutton.js?{{ cacheBuster }}"></script>
+  <script src="../../../js/libraries/details-element-polyfill.js?{{ cacheBuster }}"></script>
+  <script src="../../../js/libraries/svgxuse.min.js?{{ cacheBuster }}"></script>
+  <script src="../../../js/dist/common.min.js?{{ cacheBuster }}"></script>
+  <script src="../../../js/dist/scripts.min.js?{{ cacheBuster }}"></script>
+
+  <script src="../../../js/dist/definition.min.js?{{ cacheBuster }}"></script>
+  <script src="../../../js/dist/external-links.min.js?{{ cacheBuster }}"></script>
+  <script src="../../../js/dist/hero-slideshow.min.js?{{ cacheBuster }}"></script>
+  <script src="../../../js/dist/image-gallery.min.js?{{ cacheBuster }}"></script>
+  <script src="../../../js/dist/media-link.min.js?{{ cacheBuster }}"></script>
+  <script src="../../../js/dist/sitewide-alert.min.js?{{ cacheBuster }}"></script>
+  <script src="../../../js/dist/toggle-admin.min.js?{{ cacheBuster }}"></script>
 {% else %}
-{# Custom Standalone template head #}
-<script src="https://www.epa.gov/core/assets/vendor/jquery/jquery.min.js?v=3.6.0"></script>
-<script src="https://www.epa.gov/core/assets/vendor/css-escape/css.escape.js?v=1.5.1"></script>
-<script src="https://www.epa.gov/core/assets/vendor/jquery-once/jquery.once.min.js?v=2.2.3"></script>
-<script src="https://www.epa.gov/core/misc/drupalSettingsLoader.js?v=9.2.6"></script>
-<script src="https://www.epa.gov/core/misc/drupal.js?v=9.2.6"></script>
-<script src="https://www.epa.gov/core/misc/drupal.init.js?v=9.2.6"></script>
-<script src="https://www.epa.gov/core/assets/vendor/picturefill/picturefill.min.js?v=3.0.3"></script>
-<script src="https://www.epa.gov/core/assets/vendor/tabbable/index.umd.min.js?v=5.2.0"></script>
-<script src="https://www.epa.gov/modules/custom/epa_wysiwyg/js/plugins/epaNew/epaNew.js?r33yib"></script>
-<script src="https://www.epa.gov/themes/epa_theme/js/dist/common.min.js?v=9.2.6"></script>
-<script src="https://www.epa.gov/themes/epa_theme/js/dist/scripts.min.js?v=9.2.6"></script>
-<script src="https://www.epa.gov/themes/epa_theme/js/dist/sitewide-alert.min.js?v=9.2.6"></script>
-<script src="https://www.epa.gov/themes/epa_theme/js/dist/definition.min.js?v=9.2.6"></script>
-<script src="https://www.epa.gov/themes/epa_theme/js/dist/external-links.min.js?v=9.2.6"></script>
-<script src="https://www.epa.gov/themes/epa_theme/js/dist/media-link.min.js?v=9.2.6"></script>
-<script src="https://www.epa.gov/core/assets/vendor/jquery-form/jquery.form.min.js?v=4.3.0"></script>
-<script src="https://www.epa.gov/core/misc/progress.js?v=9.2.6"></script>
-<script src="https://www.epa.gov/core/modules/responsive_image/js/responsive_image.ajax.js?v=9.2.6"></script>
-<script src="https://www.epa.gov/core/misc/ajax.js?v=9.2.6"></script>
-<script src="https://www.epa.gov/core/themes/stable/js/ajax.js?v=9.2.6"></script>
-<script src="https://www.epa.gov/modules/contrib/views_ajax_get/views_ajax_get.js?r33yib"></script>
-<script src="https://www.epa.gov/modules/custom/epa_alerts/js/epaAlerts.js?r33yib" defer async></script>
+  {# Custom Standalone template foot #}
+  <script src="https://www.epa.gov/core/assets/vendor/jquery/jquery.min.js?v=3.6.0"></script>
+  <script src="https://www.epa.gov/core/assets/vendor/css-escape/css.escape.js?v=1.5.1"></script>
+  <script src="https://www.epa.gov/core/assets/vendor/jquery-once/jquery.once.min.js?v=2.2.3"></script>
+  <script src="https://www.epa.gov/core/misc/drupalSettingsLoader.js?v=9.2.6"></script>
+  <script src="https://www.epa.gov/core/misc/drupal.js?v=9.2.6"></script>
+  <script src="https://www.epa.gov/core/misc/drupal.init.js?v=9.2.6"></script>
+  <script src="https://www.epa.gov/core/assets/vendor/picturefill/picturefill.min.js?v=3.0.3"></script>
+  <script src="https://www.epa.gov/core/assets/vendor/tabbable/index.umd.min.js?v=5.2.0"></script>
+  <script src="https://www.epa.gov/modules/custom/epa_wysiwyg/js/plugins/epaNew/epaNew.js?r33yib"></script>
+  <script src="https://www.epa.gov/themes/epa_theme/js/dist/common.min.js?v=9.2.6"></script>
+  <script src="https://www.epa.gov/themes/epa_theme/js/dist/scripts.min.js?v=9.2.6"></script>
+
+  <script src="https://www.epa.gov/themes/epa_theme/js/dist/sitewide-alert.min.js?v=9.2.6"></script>
+  <script src="https://www.epa.gov/themes/epa_theme/js/dist/definition.min.js?v=9.2.6"></script>
+  <script src="https://www.epa.gov/themes/epa_theme/js/dist/external-links.min.js?v=9.2.6"></script>
+  <script src="https://www.epa.gov/themes/epa_theme/js/dist/media-link.min.js?v=9.2.6"></script>
+  <script src="https://www.epa.gov/themes/epa_theme/js/dist/hero-slideshow.min.js?v=9.2.6"></script>
+  <script src="https://www.epa.gov/core/assets/vendor/jquery-form/jquery.form.min.js?v=4.3.0"></script>
+  <script src="https://www.epa.gov/core/misc/progress.js?v=9.2.6"></script>
+  <script src="https://www.epa.gov/core/modules/responsive_image/js/responsive_image.ajax.js?v=9.2.6"></script>
+  <script src="https://www.epa.gov/core/misc/ajax.js?v=9.2.6"></script>
+  <script src="https://www.epa.gov/core/themes/stable/js/ajax.js?v=9.2.6"></script>
+  <script src="https://www.epa.gov/modules/contrib/views_ajax_get/views_ajax_get.js"></script>
+  <script src="https://www.epa.gov/modules/custom/epa_alerts/js/epaAlerts.js" defer async></script>
 {% endif %}
+
 <!--DO NOT REMOVE-->
 {{ patternLabFoot | raw }}
 </body>

From e62fc25eb76717b89824deb6bf2957de10583c3e Mon Sep 17 00:00:00 2001
From: Carson Oldson <coldson@forumone.com>
Date: Wed, 15 Dec 2021 09:49:08 -0600
Subject: [PATCH 23/87] [EPAD8-1512] Changed the label of 'Box' to 'Summary
 Box'. Added a 'Default' option to the style for the paragraph and made it the
 default.

---
 .../config/sync/field.field.paragraph.box.field_style.yml     | 4 +++-
 .../config/sync/field.storage.paragraph.field_style.yml       | 3 +++
 .../drupal/config/sync/paragraphs.paragraphs_type.box.yml     | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/services/drupal/config/sync/field.field.paragraph.box.field_style.yml b/services/drupal/config/sync/field.field.paragraph.box.field_style.yml
index b034fce3d2..d281d497f9 100644
--- a/services/drupal/config/sync/field.field.paragraph.box.field_style.yml
+++ b/services/drupal/config/sync/field.field.paragraph.box.field_style.yml
@@ -20,7 +20,9 @@ label: Style
 description: ''
 required: false
 translatable: false
-default_value: {  }
+default_value:
+  -
+    value: default
 default_value_callback: ''
 settings: {  }
 field_type: list_string
diff --git a/services/drupal/config/sync/field.storage.paragraph.field_style.yml b/services/drupal/config/sync/field.storage.paragraph.field_style.yml
index a81da9d98d..ab81b9ca44 100644
--- a/services/drupal/config/sync/field.storage.paragraph.field_style.yml
+++ b/services/drupal/config/sync/field.storage.paragraph.field_style.yml
@@ -11,6 +11,9 @@ entity_type: paragraph
 type: list_string
 settings:
   allowed_values:
+    -
+      value: default
+      label: Default
     -
       value: related-info
       label: 'Related Info Box'
diff --git a/services/drupal/config/sync/paragraphs.paragraphs_type.box.yml b/services/drupal/config/sync/paragraphs.paragraphs_type.box.yml
index 3185ee96f7..b64254c22c 100644
--- a/services/drupal/config/sync/paragraphs.paragraphs_type.box.yml
+++ b/services/drupal/config/sync/paragraphs.paragraphs_type.box.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 id: box
-label: Box
+label: 'Summary Box'
 icon_uuid: null
 icon_default: null
 description: ''

From 9030f83c6037dca4db15d0448720edb7867c2170 Mon Sep 17 00:00:00 2001
From: Carson Oldson <coldson@forumone.com>
Date: Wed, 15 Dec 2021 10:02:41 -0600
Subject: [PATCH 24/87] [EPAD8-1512] Renaming ckeditor plugin 'Box' to 'Summary
 Box' per Dan's recommendation.

---
 .../modules/custom/epa_wysiwyg/js/plugins/epaBox/plugin.js    | 4 ++--
 .../custom/epa_wysiwyg/src/Plugin/CKEditorPlugin/EPABox.php   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/drupal/web/modules/custom/epa_wysiwyg/js/plugins/epaBox/plugin.js b/services/drupal/web/modules/custom/epa_wysiwyg/js/plugins/epaBox/plugin.js
index 6960a13b7a..b96446a93d 100644
--- a/services/drupal/web/modules/custom/epa_wysiwyg/js/plugins/epaBox/plugin.js
+++ b/services/drupal/web/modules/custom/epa_wysiwyg/js/plugins/epaBox/plugin.js
@@ -23,14 +23,14 @@
       editor.addCommand('epaBoxCommand', new CKEDITOR.dialogCommand('epaBoxDialog'));
 
       editor.ui.addButton('epaBoxButton', {
-        label: 'Related Info Box',
+        label: 'Related Info Summary Box',
         command: 'epaBoxCommand',
         icon: iconPath
       });
 
       CKEDITOR.dialog.add('epaBoxDialog', function(editor) {
         return {
-          title: 'EPA Box',
+          title: 'Related Info Summary Box',
           minWidth: 400,
           minHeight: 200,
           contents: [{
diff --git a/services/drupal/web/modules/custom/epa_wysiwyg/src/Plugin/CKEditorPlugin/EPABox.php b/services/drupal/web/modules/custom/epa_wysiwyg/src/Plugin/CKEditorPlugin/EPABox.php
index bdeb44a6a7..14dd26bc46 100644
--- a/services/drupal/web/modules/custom/epa_wysiwyg/src/Plugin/CKEditorPlugin/EPABox.php
+++ b/services/drupal/web/modules/custom/epa_wysiwyg/src/Plugin/CKEditorPlugin/EPABox.php
@@ -14,7 +14,7 @@
  *
  * @CKEditorPlugin(
  *   id = "epaBox",
- *   label = @Translation("Related Info Box")
+ *   label = @Translation("Related Info Summary Box")
  * )
  */
 class EPABox extends CKEditorPluginBase {

From bc6d6f8ddb950af024492e35044736bd9cd3870a Mon Sep 17 00:00:00 2001
From: Carson Oldson <coldson@forumone.com>
Date: Thu, 16 Dec 2021 12:28:40 -0600
Subject: [PATCH 25/87] [EPAD8-1562] Updating webform to 6.1.2.

---
 services/drupal/composer.lock | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/services/drupal/composer.lock b/services/drupal/composer.lock
index 792c679e93..5bf14a4aea 100644
--- a/services/drupal/composer.lock
+++ b/services/drupal/composer.lock
@@ -9332,17 +9332,17 @@
         },
         {
             "name": "drupal/webform",
-            "version": "6.0.5",
+            "version": "6.1.2",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/webform.git",
-                "reference": "6.0.5"
+                "reference": "6.1.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/webform-6.0.5.zip",
-                "reference": "6.0.5",
-                "shasum": "a925d604e3b4a29f5a688a8e84fdb3a93490f641"
+                "url": "https://ftp.drupal.org/files/projects/webform-6.1.2.zip",
+                "reference": "6.1.2",
+                "shasum": "3afb96566f5d31474483e163b4e0138d43cffdcd"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9"
@@ -9352,15 +9352,15 @@
                 "drupal/bootstrap": "~3.0",
                 "drupal/captcha": "~1.0",
                 "drupal/chosen": "~3.0",
-                "drupal/clientside_validation": "~3.0",
+                "drupal/clientside_validation": "*",
                 "drupal/clientside_validation_jquery": "*",
-                "drupal/devel": "~3.0",
+                "drupal/devel": "*",
                 "drupal/entity": "~1.0",
-                "drupal/entity_print": "~2.0",
+                "drupal/entity_print": "*",
                 "drupal/gnode": "*",
-                "drupal/group": "1.0",
+                "drupal/group": "*",
                 "drupal/jquery_ui": "~1.0",
-                "drupal/jquery_ui_checkboxradio": "~1.0",
+                "drupal/jquery_ui_checkboxradio": "*",
                 "drupal/jquery_ui_datepicker": "~1.0",
                 "drupal/lingotek": "~3.0",
                 "drupal/mailsystem": "~4.0",
@@ -9369,7 +9369,7 @@
                 "drupal/smtp": "~1.0",
                 "drupal/styleguide": "~1.0",
                 "drupal/telephone_validation": "~2.0",
-                "drupal/token": "~1.0",
+                "drupal/token": "*",
                 "drupal/variationcache": "~1.0",
                 "drupal/webform_access": "*",
                 "drupal/webform_attachment": "*",
@@ -9390,8 +9390,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "6.0.5",
-                    "datestamp": "1629909787",
+                    "version": "6.1.2",
+                    "datestamp": "1638988073",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"

From b85c5c5d0f1bf67363e9bae8421dfa91f63dff65 Mon Sep 17 00:00:00 2001
From: Carson Oldson <coldson@forumone.com>
Date: Thu, 16 Dec 2021 12:28:58 -0600
Subject: [PATCH 26/87] [EPAD8-1562] Adding new/updated config.

---
 .../system.action.webform_archive_action.yml     | 11 +++++++++++
 .../sync/system.action.webform_close_action.yml  | 11 +++++++++++
 .../sync/system.action.webform_delete_action.yml | 11 +++++++++++
 .../sync/system.action.webform_open_action.yml   | 11 +++++++++++
 .../system.action.webform_unarchive_action.yml   | 11 +++++++++++
 services/drupal/config/sync/webform.settings.yml | 16 ++++++++++++++++
 6 files changed, 71 insertions(+)
 create mode 100644 services/drupal/config/sync/system.action.webform_archive_action.yml
 create mode 100644 services/drupal/config/sync/system.action.webform_close_action.yml
 create mode 100644 services/drupal/config/sync/system.action.webform_delete_action.yml
 create mode 100644 services/drupal/config/sync/system.action.webform_open_action.yml
 create mode 100644 services/drupal/config/sync/system.action.webform_unarchive_action.yml

diff --git a/services/drupal/config/sync/system.action.webform_archive_action.yml b/services/drupal/config/sync/system.action.webform_archive_action.yml
new file mode 100644
index 0000000000..dcb35cc09f
--- /dev/null
+++ b/services/drupal/config/sync/system.action.webform_archive_action.yml
@@ -0,0 +1,11 @@
+uuid: 31bd3812-ec15-436c-a1d1-054ac8cfd689
+langcode: en
+status: true
+dependencies:
+  module:
+    - webform
+id: webform_archive_action
+label: 'Archive webform'
+type: webform
+plugin: webform_archive_action
+configuration: {  }
diff --git a/services/drupal/config/sync/system.action.webform_close_action.yml b/services/drupal/config/sync/system.action.webform_close_action.yml
new file mode 100644
index 0000000000..f4cc20a66c
--- /dev/null
+++ b/services/drupal/config/sync/system.action.webform_close_action.yml
@@ -0,0 +1,11 @@
+uuid: e53b9193-874c-4c17-8b3f-d4d5bdc6f1d1
+langcode: en
+status: true
+dependencies:
+  module:
+    - webform
+id: webform_close_action
+label: 'Close webform'
+type: webform
+plugin: webform_close_action
+configuration: {  }
diff --git a/services/drupal/config/sync/system.action.webform_delete_action.yml b/services/drupal/config/sync/system.action.webform_delete_action.yml
new file mode 100644
index 0000000000..bc51d23cff
--- /dev/null
+++ b/services/drupal/config/sync/system.action.webform_delete_action.yml
@@ -0,0 +1,11 @@
+uuid: 475ce035-e38a-4970-982b-b9d73f3f3f28
+langcode: en
+status: true
+dependencies:
+  module:
+    - webform
+id: webform_delete_action
+label: 'Delete webform'
+type: webform
+plugin: webform_delete_action
+configuration: {  }
diff --git a/services/drupal/config/sync/system.action.webform_open_action.yml b/services/drupal/config/sync/system.action.webform_open_action.yml
new file mode 100644
index 0000000000..340b74ba65
--- /dev/null
+++ b/services/drupal/config/sync/system.action.webform_open_action.yml
@@ -0,0 +1,11 @@
+uuid: a1e07ad1-1486-4f80-bff1-7c719cd398d0
+langcode: en
+status: true
+dependencies:
+  module:
+    - webform
+id: webform_open_action
+label: 'Open webform'
+type: webform
+plugin: webform_open_action
+configuration: {  }
diff --git a/services/drupal/config/sync/system.action.webform_unarchive_action.yml b/services/drupal/config/sync/system.action.webform_unarchive_action.yml
new file mode 100644
index 0000000000..436c7cfceb
--- /dev/null
+++ b/services/drupal/config/sync/system.action.webform_unarchive_action.yml
@@ -0,0 +1,11 @@
+uuid: c5503c54-fadb-4997-ba13-651c250462dd
+langcode: en
+status: true
+dependencies:
+  module:
+    - webform
+id: webform_unarchive_action
+label: 'Restore webform'
+type: webform
+plugin: webform_unarchive_action
+configuration: {  }
diff --git a/services/drupal/config/sync/webform.settings.yml b/services/drupal/config/sync/webform.settings.yml
index a1899007ed..5fdb7b13d2 100644
--- a/services/drupal/config/sync/webform.settings.yml
+++ b/services/drupal/config/sync/webform.settings.yml
@@ -85,6 +85,20 @@ settings:
     wide:
       title: Wide
       width: 1000
+  webform_bulk_form: true
+  webform_bulk_form_actions:
+    - webform_open_action
+    - webform_close_action
+    - webform_archive_action
+    - webform_unarchive_action
+    - webform_delete_action
+  webform_submission_bulk_form: true
+  webform_submission_bulk_form_actions:
+    - webform_submission_make_sticky_action
+    - webform_submission_make_unsticky_action
+    - webform_submission_make_lock_action
+    - webform_submission_make_unlock_action
+    - webform_submission_delete_action
 assets:
   css: ''
   javascript: ''
@@ -123,6 +137,7 @@ batch:
 purge:
   cron_size: 100
 form:
+  limit: 50
   filter_category: ''
   filter_state: ''
 element:
@@ -277,6 +292,7 @@ ui:
   dialog_disabled: false
   offcanvas_disabled: false
   promotions_disabled: false
+  support_disabled: false
   description_help: true
   toolbar_item: false
 libraries:

From ca57ba2adf143518b17262abcfff0621d0b26bf9 Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Thu, 16 Dec 2021 11:19:37 -0800
Subject: [PATCH 27/87] [EPAD8-1559] Create new Author Names field

---
 ..._form_display.node.perspective.default.yml | 12 +++++++
 ..._view_display.node.perspective.default.yml | 25 +++++++++++++
 ...ity_view_display.node.perspective.link.yml |  2 ++
 ..._display.node.perspective.search_index.yml |  2 ++
 ...y_view_display.node.perspective.teaser.yml |  2 ++
 ...ty_view_display.node.perspective.token.yml |  2 ++
 ...ld.node.perspective.field_author_names.yml | 35 +++++++++++++++++++
 .../field.storage.node.field_author_names.yml | 20 +++++++++++
 8 files changed, 100 insertions(+)
 create mode 100644 services/drupal/config/sync/field.field.node.perspective.field_author_names.yml
 create mode 100644 services/drupal/config/sync/field.storage.node.field_author_names.yml

diff --git a/services/drupal/config/sync/core.entity_form_display.node.perspective.default.yml b/services/drupal/config/sync/core.entity_form_display.node.perspective.default.yml
index 44eb3f0bd2..54509732c1 100644
--- a/services/drupal/config/sync/core.entity_form_display.node.perspective.default.yml
+++ b/services/drupal/config/sync/core.entity_form_display.node.perspective.default.yml
@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.node.perspective.field_author_names
     - field.field.node.perspective.field_authors
     - field.field.node.perspective.field_channel
     - field.field.node.perspective.field_description
@@ -131,6 +132,16 @@ content:
       help_text: ''
       multiple: false
     third_party_settings: {  }
+  field_author_names:
+    type: entity_reference_autocomplete
+    weight: 17
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   field_authors:
     type: paragraphs
     weight: 9
@@ -262,6 +273,7 @@ content:
       save_lineage: false
       hierarchy_depth: 0
       required_depth: 0
+      none_label: '- Please select -'
     third_party_settings: {  }
     type: cshs
     region: content
diff --git a/services/drupal/config/sync/core.entity_view_display.node.perspective.default.yml b/services/drupal/config/sync/core.entity_view_display.node.perspective.default.yml
index 7e3ead893d..1b584b014e 100644
--- a/services/drupal/config/sync/core.entity_view_display.node.perspective.default.yml
+++ b/services/drupal/config/sync/core.entity_view_display.node.perspective.default.yml
@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.node.perspective.field_author_names
     - field.field.node.perspective.field_authors
     - field.field.node.perspective.field_channel
     - field.field.node.perspective.field_description
@@ -184,6 +185,22 @@ third_party_settings:
                 type: entity_reference_label
             additional: {  }
             weight: 10
+          440c065c-cdf4-4864-bfdf-b8b1cfde144b:
+            uuid: 440c065c-cdf4-4864-bfdf-b8b1cfde144b
+            region: content
+            configuration:
+              label_display: '0'
+              context_mapping:
+                entity: layout_builder.entity
+              id: 'field_block:node:perspective:field_author_names'
+              formatter:
+                label: above
+                settings:
+                  link: true
+                third_party_settings: {  }
+                type: entity_reference_label
+            additional: {  }
+            weight: 11
         third_party_settings: {  }
   layout_builder_restrictions:
     allowed_block_categories: {  }
@@ -196,6 +213,14 @@ targetEntityType: node
 bundle: perspective
 mode: default
 content:
+  field_author_names:
+    weight: 20
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    type: entity_reference_label
+    region: content
   field_authors:
     type: entity_reference_revisions_entity_view
     weight: 14
diff --git a/services/drupal/config/sync/core.entity_view_display.node.perspective.link.yml b/services/drupal/config/sync/core.entity_view_display.node.perspective.link.yml
index 4aaf213977..3c829023c1 100644
--- a/services/drupal/config/sync/core.entity_view_display.node.perspective.link.yml
+++ b/services/drupal/config/sync/core.entity_view_display.node.perspective.link.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.node.link
+    - field.field.node.perspective.field_author_names
     - field.field.node.perspective.field_authors
     - field.field.node.perspective.field_channel
     - field.field.node.perspective.field_description
@@ -38,6 +39,7 @@ content: {  }
 hidden:
   content_moderation_control: true
   entitygroupfield: true
+  field_author_names: true
   field_authors: true
   field_channel: true
   field_description: true
diff --git a/services/drupal/config/sync/core.entity_view_display.node.perspective.search_index.yml b/services/drupal/config/sync/core.entity_view_display.node.perspective.search_index.yml
index a22de329c1..8db5eb22cd 100644
--- a/services/drupal/config/sync/core.entity_view_display.node.perspective.search_index.yml
+++ b/services/drupal/config/sync/core.entity_view_display.node.perspective.search_index.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.node.search_index
+    - field.field.node.perspective.field_author_names
     - field.field.node.perspective.field_authors
     - field.field.node.perspective.field_channel
     - field.field.node.perspective.field_description
@@ -48,6 +49,7 @@ content:
 hidden:
   content_moderation_control: true
   entitygroupfield: true
+  field_author_names: true
   field_authors: true
   field_channel: true
   field_description: true
diff --git a/services/drupal/config/sync/core.entity_view_display.node.perspective.teaser.yml b/services/drupal/config/sync/core.entity_view_display.node.perspective.teaser.yml
index 391f2ca04e..39d8ef624e 100644
--- a/services/drupal/config/sync/core.entity_view_display.node.perspective.teaser.yml
+++ b/services/drupal/config/sync/core.entity_view_display.node.perspective.teaser.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.node.teaser
+    - field.field.node.perspective.field_author_names
     - field.field.node.perspective.field_authors
     - field.field.node.perspective.field_channel
     - field.field.node.perspective.field_description
@@ -68,6 +69,7 @@ content:
 hidden:
   content_moderation_control: true
   entitygroupfield: true
+  field_author_names: true
   field_channel: true
   field_env_laws_regs_and_treaties: true
   field_geographic_locations: true
diff --git a/services/drupal/config/sync/core.entity_view_display.node.perspective.token.yml b/services/drupal/config/sync/core.entity_view_display.node.perspective.token.yml
index e5ba4ece26..241b75e70e 100644
--- a/services/drupal/config/sync/core.entity_view_display.node.perspective.token.yml
+++ b/services/drupal/config/sync/core.entity_view_display.node.perspective.token.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.node.token
+    - field.field.node.perspective.field_author_names
     - field.field.node.perspective.field_authors
     - field.field.node.perspective.field_channel
     - field.field.node.perspective.field_description
@@ -197,6 +198,7 @@ content:
     third_party_settings: {  }
 hidden:
   content_moderation_control: true
+  field_author_names: true
   field_geographic_locations: true
   links: true
   search_api_excerpt: true
diff --git a/services/drupal/config/sync/field.field.node.perspective.field_author_names.yml b/services/drupal/config/sync/field.field.node.perspective.field_author_names.yml
new file mode 100644
index 0000000000..fd43b837af
--- /dev/null
+++ b/services/drupal/config/sync/field.field.node.perspective.field_author_names.yml
@@ -0,0 +1,35 @@
+uuid: e161c8af-0210-4661-bf3f-b22c7117658a
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_author_names
+    - node.type.perspective
+    - taxonomy.vocabulary.author
+  module:
+    - custom_add_another
+third_party_settings:
+  custom_add_another:
+    custom_add_another: ''
+    custom_remove: ''
+id: node.perspective.field_author_names
+field_name: field_author_names
+entity_type: node
+bundle: perspective
+label: 'Author Names'
+description: 'Hidden field, that stores the names of the Authors associated with this <i>Perspective</i>.'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:taxonomy_term'
+  handler_settings:
+    target_bundles:
+      author: author
+    sort:
+      field: name
+      direction: asc
+    auto_create: false
+    auto_create_bundle: ''
+field_type: entity_reference
diff --git a/services/drupal/config/sync/field.storage.node.field_author_names.yml b/services/drupal/config/sync/field.storage.node.field_author_names.yml
new file mode 100644
index 0000000000..3192ba6d40
--- /dev/null
+++ b/services/drupal/config/sync/field.storage.node.field_author_names.yml
@@ -0,0 +1,20 @@
+uuid: f32dc8ea-6206-41ea-a3ff-3236ebdc3d1a
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - taxonomy
+id: node.field_author_names
+field_name: field_author_names
+entity_type: node
+type: entity_reference
+settings:
+  target_type: taxonomy_term
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

From b6ec50341b01b29d4b6c6e9d401efcd5ea07528f Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Fri, 17 Dec 2021 09:37:03 -0500
Subject: [PATCH 28/87] EPAD8-1512 do not rename the ckeditor box plugin

---
 .../modules/custom/epa_wysiwyg/js/plugins/epaBox/plugin.js    | 4 ++--
 .../custom/epa_wysiwyg/src/Plugin/CKEditorPlugin/EPABox.php   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/drupal/web/modules/custom/epa_wysiwyg/js/plugins/epaBox/plugin.js b/services/drupal/web/modules/custom/epa_wysiwyg/js/plugins/epaBox/plugin.js
index b96446a93d..6960a13b7a 100644
--- a/services/drupal/web/modules/custom/epa_wysiwyg/js/plugins/epaBox/plugin.js
+++ b/services/drupal/web/modules/custom/epa_wysiwyg/js/plugins/epaBox/plugin.js
@@ -23,14 +23,14 @@
       editor.addCommand('epaBoxCommand', new CKEDITOR.dialogCommand('epaBoxDialog'));
 
       editor.ui.addButton('epaBoxButton', {
-        label: 'Related Info Summary Box',
+        label: 'Related Info Box',
         command: 'epaBoxCommand',
         icon: iconPath
       });
 
       CKEDITOR.dialog.add('epaBoxDialog', function(editor) {
         return {
-          title: 'Related Info Summary Box',
+          title: 'EPA Box',
           minWidth: 400,
           minHeight: 200,
           contents: [{
diff --git a/services/drupal/web/modules/custom/epa_wysiwyg/src/Plugin/CKEditorPlugin/EPABox.php b/services/drupal/web/modules/custom/epa_wysiwyg/src/Plugin/CKEditorPlugin/EPABox.php
index 14dd26bc46..bdeb44a6a7 100644
--- a/services/drupal/web/modules/custom/epa_wysiwyg/src/Plugin/CKEditorPlugin/EPABox.php
+++ b/services/drupal/web/modules/custom/epa_wysiwyg/src/Plugin/CKEditorPlugin/EPABox.php
@@ -14,7 +14,7 @@
  *
  * @CKEditorPlugin(
  *   id = "epaBox",
- *   label = @Translation("Related Info Summary Box")
+ *   label = @Translation("Related Info Box")
  * )
  */
 class EPABox extends CKEditorPluginBase {

From 2f9991a78fde191033046bcde9411d66e50361ec Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Sun, 19 Dec 2021 17:16:18 -0500
Subject: [PATCH 29/87] [EPAD8-1558] add width for 4th column

---
 .../web/modules/custom/epa_workflow/css/revision-list.css     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/drupal/web/modules/custom/epa_workflow/css/revision-list.css b/services/drupal/web/modules/custom/epa_workflow/css/revision-list.css
index 1d056f1216..098b044605 100644
--- a/services/drupal/web/modules/custom/epa_workflow/css/revision-list.css
+++ b/services/drupal/web/modules/custom/epa_workflow/css/revision-list.css
@@ -12,6 +12,10 @@
   min-width: 200px;
 }
 
+#edit-node-revisions-table thead th:nth-child(4) {
+  width: 310px;
+}
+
 #edit-node-revisions-table tbody tr:first-child td {
   padding-bottom: 3rem;
 }

From 8620e2fe85b414fc7b7e32da96663a51acb16db2 Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Sun, 19 Dec 2021 23:50:20 -0800
Subject: [PATCH 30/87] [EPAD8-1559] Create presave

---
 .../custom/epa_workflow/epa_workflow.module    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
index fe43e08a04..015dad7aad 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
@@ -616,3 +616,21 @@ function epa_workflow_module_implements_alter(&$implementations, $hook) {
     unset($implementations['scheduled_publish']);
   }
 }
+
+/**
+ * Implements hook_entity_presave().
+ */
+function epa_workflow_entity_presave(EntityInterface $entity) {
+  if ($entity->bundle() == 'perspective') {
+    $author_paragraphs = $entity->field_author_as_para->getValue();
+    $tids = [];
+    foreach ($author_paragraphs as $author) {
+      array_push($tids, $author['subform']['field_a'][0]['target_id']);
+    }
+    foreach ($tids as $tid) {
+      $entity->field_author_names[] = [
+        'target_id' => $tid
+      ];
+    }
+  }
+}

From 8b9f17e8384c2ebe984668d20ff90b9437549988 Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Fri, 17 Dec 2021 16:35:35 -0500
Subject: [PATCH 31/87] EPAD8-1552: Consolidate messages and local tasks to a
 single admin info block

---
 .../sync/block.block.gesso_local_actions.yml  |  4 +-
 .../sync/block.block.gesso_local_tasks.yml    |  4 +-
 .../sync/block.block.gesso_messages.yml       |  2 +-
 .../web/themes/epa_theme/includes/node.inc    | 48 +++++++++++++++++++
 .../epa_theme/js/src/toggle-admin.es6.js      |  4 +-
 .../epa_theme/source/_meta/_00-head.mustache  | 17 +++++++
 .../epa_theme/source/_meta/_00-head.twig      | 16 +++++++
 .../epa_theme/source/_meta/_01-foot.mustache  |  6 +++
 .../epa_theme/source/_meta/_01-foot.twig      |  6 +++
 .../article-with-admin/article-with-admin.md  |  2 +-
 .../article-with-sidebar.md                   |  2 +-
 .../05-components/article/article.md          |  2 +-
 .../05-components/article/article.twig        | 29 ++++++-----
 .../detail-pages/page-with-sidenav.twig       |  9 ++--
 .../06-templates/detail-pages/page.twig       |  9 ++--
 .../listing-pages/listing-page.twig           | 12 ++---
 .../web-area-homepages/microsite.twig         | 14 +++---
 .../resource-directory.twig                   | 12 ++---
 .../07-pages/detail-pages/00-page.twig        |  9 +---
 .../detail-pages/02-page-with-sidenav.twig    |  2 +-
 .../03-page-with-wide-template.twig           | 11 ++---
 .../07-pages/detail-pages/event.twig          |  5 +-
 .../detail-pages/frequent-question.twig       |  2 +-
 .../07-pages/detail-pages/news-release.twig   |  5 +-
 .../perspective-with-two-authors.twig         |  5 +-
 .../07-pages/detail-pages/perspective.twig    |  5 +-
 .../07-pages/detail-pages/public-notice.twig  |  5 +-
 .../07-pages/detail-pages/regulation.twig     |  5 +-
 .../detail-pages/webform-with-sidenav.twig    |  2 +-
 .../07-pages/detail-pages/webform.twig        | 11 ++---
 .../listing-pages/frequent-questions.twig     |  2 +-
 .../07-pages/listing-pages/news-releases.twig |  2 +-
 .../07-pages/listing-pages/perspectives.twig  |  2 +-
 .../listing-pages/public-notices.twig         |  2 +-
 .../web-area-homepages/microsite.twig         | 11 ++---
 .../resource-directory.twig                   | 11 ++---
 .../content/node--event--full.html.twig       | 23 ++++-----
 .../content/node--faq--full.html.twig         | 23 ++++-----
 .../templates/content/node--full.html.twig    | 23 ++++-----
 .../node--news-release--full.html.twig        | 23 ++++-----
 .../content/node--perspective--full.html.twig | 23 ++++-----
 .../node--public-notice--full.html.twig       | 23 ++++-----
 .../content/node--regulation--full.html.twig  | 23 ++++-----
 .../content/node--web-area.html.twig          | 19 ++++----
 .../views/views-view--search-faqs.html.twig   | 15 +++---
 ...views-view--search-news-releases.html.twig | 15 +++---
 .../views-view--search-perspectives.html.twig | 15 +++---
 ...iews-view--search-public-notices.html.twig | 15 +++---
 48 files changed, 301 insertions(+), 234 deletions(-)
 create mode 100644 services/drupal/web/themes/epa_theme/source/_meta/_00-head.mustache
 create mode 100644 services/drupal/web/themes/epa_theme/source/_meta/_00-head.twig
 create mode 100644 services/drupal/web/themes/epa_theme/source/_meta/_01-foot.mustache
 create mode 100644 services/drupal/web/themes/epa_theme/source/_meta/_01-foot.twig

diff --git a/services/drupal/config/sync/block.block.gesso_local_actions.yml b/services/drupal/config/sync/block.block.gesso_local_actions.yml
index d3fd83ea4d..c7f1b00242 100644
--- a/services/drupal/config/sync/block.block.gesso_local_actions.yml
+++ b/services/drupal/config/sync/block.block.gesso_local_actions.yml
@@ -8,8 +8,8 @@ _core:
   default_config_hash: PffmQ-ABSz5tFjWmVsR7NesunDnEivvopnJnBjl8KNE
 id: gesso_local_actions
 theme: epa_theme
-region: disabled
-weight: 0
+region: messages
+weight: -16
 provider: null
 plugin: local_actions_block
 settings:
diff --git a/services/drupal/config/sync/block.block.gesso_local_tasks.yml b/services/drupal/config/sync/block.block.gesso_local_tasks.yml
index a56d5bb9ae..e11dc40fe6 100644
--- a/services/drupal/config/sync/block.block.gesso_local_tasks.yml
+++ b/services/drupal/config/sync/block.block.gesso_local_tasks.yml
@@ -8,8 +8,8 @@ _core:
   default_config_hash: c-06bbElRY5sKmglk74ppgTW93Et4-EJFyNiUZMb8JY
 id: gesso_local_tasks
 theme: epa_theme
-region: disabled
-weight: 0
+region: messages
+weight: -17
 provider: null
 plugin: local_tasks_block
 settings:
diff --git a/services/drupal/config/sync/block.block.gesso_messages.yml b/services/drupal/config/sync/block.block.gesso_messages.yml
index f301c263bc..2fb42ef0c0 100644
--- a/services/drupal/config/sync/block.block.gesso_messages.yml
+++ b/services/drupal/config/sync/block.block.gesso_messages.yml
@@ -11,7 +11,7 @@ _core:
 id: gesso_messages
 theme: epa_theme
 region: messages
-weight: -14
+weight: -18
 provider: null
 plugin: system_messages_block
 settings:
diff --git a/services/drupal/web/themes/epa_theme/includes/node.inc b/services/drupal/web/themes/epa_theme/includes/node.inc
index 258cb15eb0..24a6366df3 100644
--- a/services/drupal/web/themes/epa_theme/includes/node.inc
+++ b/services/drupal/web/themes/epa_theme/includes/node.inc
@@ -2,6 +2,22 @@
 
 use Drupal\Core\Link;
 
+/**
+ * Implements hook_preprocess_node().
+ */
+function epa_theme_preprocess_node(&$variables) {
+  $view_mode = $variables['view_mode'];
+
+  // Array of view modes to add regions to.
+  $allowed_view_modes = ['full'];
+
+  if (in_array($view_mode, $allowed_view_modes)) {
+    // Array of regions to add to node template.
+    $allowed_regions = ['messages'];
+    _add_regions_to_node($allowed_regions, $variables);
+  }
+}
+
 /**
  * Implements hook_preprocess_node__BUNDLE__VIEW_MODE().
  */
@@ -95,3 +111,35 @@ function epa_theme_preprocess_node__news_release__full(&$variables) {
     }
   }
 }
+
+/**
+* Custom function to add page regions to node templates.
+*/
+function _add_regions_to_node($allowed_regions, &$variables) {
+  // Get active theme.
+  $theme = \Drupal::theme()->getActiveTheme()->getName();
+
+  // Get current theme regions.
+  $available_regions = system_region_list($theme, 'REGIONS_ALL');
+
+  // Validate allowed regions with available regions.
+  $regions = array_intersect(array_keys($available_regions), $allowed_regions);
+
+  foreach ($regions as $key => $region) {
+    // Load blocks from this region and sort them.
+    $blocks = \Drupal::entityTypeManager()
+      ->getStorage('block')
+      ->loadByProperties(array('theme'  => $theme, 'region' => $region));
+    uasort($blocks, 'Drupal\block\Entity\Block::sort');
+
+    // Build blocks and assign to template variable.
+    $build = array();
+    $builder = \Drupal::entityTypeManager()->getViewBuilder('block');
+    foreach ($blocks as $key => $block) {
+      if ($block->access('view')) {
+        $build[$key] = $builder->view($block, 'block');
+      }
+    }
+    $variables['region_' . $region] = $build;
+  }
+}
diff --git a/services/drupal/web/themes/epa_theme/js/src/toggle-admin.es6.js b/services/drupal/web/themes/epa_theme/js/src/toggle-admin.es6.js
index b85cb820bd..cc3dcceb1e 100644
--- a/services/drupal/web/themes/epa_theme/js/src/toggle-admin.es6.js
+++ b/services/drupal/web/themes/epa_theme/js/src/toggle-admin.es6.js
@@ -5,9 +5,7 @@ import Drupal from 'drupal';
   Drupal.behaviors.toggleAdmin = {
     attach(context) {
       const toggleButton = context.querySelector('.js-toggle-admin');
-      const adminContent = context.querySelectorAll(
-        '.usa-alert, .button-group--base[aria-label="Primary tasks"], #content-moderation-entity-moderation-form'
-      );
+      const adminContent = context.querySelectorAll('.js-toggle-admin-content');
 
       if (toggleButton !== null) {
         toggleButton.addEventListener('click', event => {
diff --git a/services/drupal/web/themes/epa_theme/source/_meta/_00-head.mustache b/services/drupal/web/themes/epa_theme/source/_meta/_00-head.mustache
new file mode 100644
index 0000000000..45ce3bb7d0
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_meta/_00-head.mustache
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html class="{{ htmlClass }}">
+  <head>
+    <title>{{ title }}</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width" />
+
+    <link rel="stylesheet" href="../../css/style.css?{{ cacheBuster }}" media="all" />
+    <link rel="stylesheet" href="../../css/pattern-scaffolding.css?{{ cacheBuster }}" media="all" />
+
+    <!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
+    {{{ patternLabHead }}}
+    <!-- End Pattern Lab -->
+
+  </head>
+  <body class="{{ bodyClass }}">
+    
diff --git a/services/drupal/web/themes/epa_theme/source/_meta/_00-head.twig b/services/drupal/web/themes/epa_theme/source/_meta/_00-head.twig
new file mode 100644
index 0000000000..4b49c63b7c
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_meta/_00-head.twig
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html class="{{ htmlClass }}">
+  <head>
+    <title>{{ title }}</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width" />
+
+    <link rel="stylesheet" href="../../css/style.css?{{ cacheBuster }}" media="all" />
+    <link rel="stylesheet" href="../../css/pattern-scaffolding.css?{{ cacheBuster }}" media="all" />
+
+    <!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
+    {{ patternLabHead | raw }}
+    <!-- End Pattern Lab -->
+
+  </head>
+  <body class="{{ bodyClass }}">
diff --git a/services/drupal/web/themes/epa_theme/source/_meta/_01-foot.mustache b/services/drupal/web/themes/epa_theme/source/_meta/_01-foot.mustache
new file mode 100644
index 0000000000..797d9418d9
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_meta/_01-foot.mustache
@@ -0,0 +1,6 @@
+
+<!--DO NOT REMOVE-->
+{{{ patternLabFoot }}}
+
+</body>
+</html>
diff --git a/services/drupal/web/themes/epa_theme/source/_meta/_01-foot.twig b/services/drupal/web/themes/epa_theme/source/_meta/_01-foot.twig
new file mode 100644
index 0000000000..159dae3eb6
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_meta/_01-foot.twig
@@ -0,0 +1,6 @@
+
+<!--DO NOT REMOVE-->
+{{ patternLabFoot | raw }}
+
+</body>
+</html>
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/article/article-with-admin/article-with-admin.md b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/article/article-with-admin/article-with-admin.md
index 74f762e60a..bc228d887c 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/article/article-with-admin/article-with-admin.md
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/article/article-with-admin/article-with-admin.md
@@ -10,5 +10,5 @@ __Variables:__
 
 __Blocks:__
 * title: Twig block for title.
-* local_tasks: Twig block for local tasks.
+* admin_info: Twig block for status messages and local tasks.
 * content: Twig block for main content.
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/article/article-with-sidebar/article-with-sidebar.md b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/article/article-with-sidebar/article-with-sidebar.md
index 39405a27a2..40d77eb32c 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/article/article-with-sidebar/article-with-sidebar.md
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/article/article-with-sidebar/article-with-sidebar.md
@@ -11,5 +11,5 @@ __Variables:__
 
 __Blocks:__
 * title: Twig block for title.
-* local_tasks: Twig block for local tasks.
+* admin_info: Twig block for status messages and local tasks.
 * content: Twig block for main content.
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/article/article.md b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/article/article.md
index d41a5fe023..1c1d20227a 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/article/article.md
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/article/article.md
@@ -10,5 +10,5 @@ __Variables:__
 
 __Blocks:__
 * title: Twig block for title.
-* local_tasks: Twig block for local tasks.
+* admin_info: Twig block for status messages and local tasks.
 * content: Twig block for main content.
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/article/article.twig b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/article/article.twig
index f48c9bae06..82d7055281 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/article/article.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/article/article.twig
@@ -28,22 +28,21 @@
     } %}
   {% endblock %}
 
-  {% block messages %}
-    {% if show_admin_info %}
-      {% include '@uswds/alert/alert--success/alert--success.twig' with {
-        'title': 'Status message',
-        'content': '<p class="usa-alert__text">Basic page <em class="placeholder"><a href="#" hreflang="en">' ~ page_title ~ '</a></em> has been updated.</p>',
-      } %}
-    {% endif %}
-  {% endblock %}
 
-  {% block local_tasks %}
-    {% if show_admin_info %}
-      {% include '@components/button-group/button-group--base/button-group--base.twig' with {
-        'buttons': local_tasks,
-      } %}
-    {% endif %}
-  {% endblock %}
+  {% if show_admin_info %}
+    <div class="js-toggle-admin-content">
+      {% block admin_info %}
+        {% include '@uswds/alert/alert--success/alert--success.twig' with {
+          'title': 'Status message',
+          'content': '<p class="usa-alert__text">Basic page <em class="placeholder"><a href="#" hreflang="en">' ~ page_title ~ '</a></em> has been updated.</p>',
+        } %}
+
+        {% include '@components/button-group/button-group--base/button-group--base.twig' with {
+          'buttons': local_tasks,
+        } %}
+      {% endblock %}
+    </div>
+  {% endif %}
 
   {% block intro %}
     {% if intro %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/detail-pages/page-with-sidenav.twig b/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/detail-pages/page-with-sidenav.twig
index fa77d11eb6..467f454ea7 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/detail-pages/page-with-sidenav.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/detail-pages/page-with-sidenav.twig
@@ -9,14 +9,11 @@
         'intro': intro,
         'content': body,
         'sidebar': sidebar,
+        'show_admin_info': show_admin_info,
       } %}
 
-        {% block messages %}
-          {{ messages }}
-        {% endblock %}
-
-        {% block local_tasks %}
-          {{ tasks }}
+        {% block admin_info %}
+          {{ admin_info }}
         {% endblock %}
       {% endembed %}
     {% endblock %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/detail-pages/page.twig b/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/detail-pages/page.twig
index 80c6cf7ae4..cb8065b7fe 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/detail-pages/page.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/detail-pages/page.twig
@@ -4,14 +4,11 @@
     'intro': intro,
     'content': body,
     'sidebar': sidebar,
+    'show_admin_info': show_admin_info,
   } %}
 
-    {% block messages %}
-      {{ messages }}
-    {% endblock %}
-
-    {% block local_tasks %}
-      {{ tasks }}
+    {% block admin_info %}
+      {{ admin_info }}
     {% endblock %}
   {% endembed %}
 {% endset %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/listing-pages/listing-page.twig b/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/listing-pages/listing-page.twig
index 94d29a1109..6ac0138ebe 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/listing-pages/listing-page.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/listing-pages/listing-page.twig
@@ -4,13 +4,11 @@
     'contextual_links': contextual_links,
   } %}
 
-  {% block messages %}
-    {{ messages }}
-  {% endblock %}
-
-  {% block local_tasks %}
-    {{ tasks }}
-  {% endblock %}
+  {% if show_admin_info %}
+    <div class="js-toggle-admin-content">
+      {{ admin_info }}
+    </div>
+  {% endif %}
 
   {% block intro %}
     {{ intro }}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/web-area-homepages/microsite.twig b/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/web-area-homepages/microsite.twig
index 35d54d882a..2fd0b60659 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/web-area-homepages/microsite.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/web-area-homepages/microsite.twig
@@ -1,15 +1,13 @@
 {% set content %}
   {% include '@components/page-title/page-title.twig' with {
-    'page_title': title
+    'page_title': title,
   } %}
 
-  {% block messages %}
-    {{ messages }}
-  {% endblock %}
-
-  {% block local_tasks %}
-    {{ tasks }}
-  {% endblock %}
+  {% if show_admin_info %}
+    <div class="js-toggle-admin-content">
+      {{ admin_info }}
+    </div>
+  {% endif %}
 
   {{ slideshow }}
   {{ body }}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/web-area-homepages/resource-directory.twig b/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/web-area-homepages/resource-directory.twig
index 64b44ccc2e..7f54ae11ad 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/web-area-homepages/resource-directory.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/06-templates/web-area-homepages/resource-directory.twig
@@ -3,13 +3,11 @@
     'page_title': title
   } %}
 
-  {% block messages %}
-    {{ messages }}
-  {% endblock %}
-
-  {% block local_tasks %}
-    {{ tasks }}
-  {% endblock %}
+  {% if show_admin_info %}
+    <div class="js-toggle-admin-content">
+      {{ admin_info }}
+    </div>
+  {% endif %}
 
   {% include '@layouts/resource-directory/resource-directory.twig' with {
     'has_sidebar': has_sidebar,
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/00-page.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/00-page.twig
index ad58254c8d..5c4c0e714c 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/00-page.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/00-page.twig
@@ -16,17 +16,13 @@
   } %}
 {% endset %}
 
-{% set page_messages %}
+{% set admin_info %}
   {% if show_admin_info %}
     {% include '@uswds/alert/alert--success/alert--success.twig' with {
       'title': 'Status message',
       'content': '<p class="usa-alert__text">Basic page <em class="placeholder"><a href="#" hreflang="en">' ~ page_title ~ '</a></em> has been updated.</p>',
     } %}
-  {% endif %}
-{% endset %}
 
-{% set page_tasks %}
-  {% if show_admin_info %}
     {% include '@components/button-group/button-group--base/button-group--base.twig' with {
       'buttons': local_tasks,
     } %}
@@ -54,8 +50,7 @@
 {% set page_content %}
   {% include '@templates/detail-pages/page.twig' with {
     'title': page_title,
-    'messages': page_messages,
-    'tasks': page_tasks,
+    'admin_info': admin_info,
     'intro': intro,
     'body': content,
   } %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/02-page-with-sidenav.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/02-page-with-sidenav.twig
index aca368df80..42cef24669 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/02-page-with-sidenav.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/02-page-with-sidenav.twig
@@ -121,5 +121,5 @@
 
 {# pass page_content to default page wrapper #}
 {% include '@pages/_page-default.twig' with {
-  'content': page_content
+  'content': page_content,
 } %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/03-page-with-wide-template.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/03-page-with-wide-template.twig
index 3e3f61cc96..d474769640 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/03-page-with-wide-template.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/03-page-with-wide-template.twig
@@ -11,17 +11,13 @@
   } %}
 {% endset %}
 
-{% set page_messages %}
+{% set page_admin_info %}
   {% if show_admin_info %}
     {% include '@uswds/alert/alert--success/alert--success.twig' with {
       'title': 'Status message',
       'content': '<p class="usa-alert__text">Basic page <em class="placeholder"><a href="#" hreflang="en">' ~ page_title ~ '</a></em> has been updated.</p>',
     } %}
-  {% endif %}
-{% endset %}
 
-{% set page_tasks %}
-  {% if show_admin_info %}
     {% include '@components/button-group/button-group--base/button-group--base.twig' with {
       'buttons': local_tasks,
     } %}
@@ -175,8 +171,7 @@
 {% set page_content %}
   {% include '@templates/detail-pages/page.twig' with {
     'title': page_title,
-    'messages': page_messages,
-    'tasks': page_tasks,
+    'admin_info': page_admin_info,
     'intro': intro,
     'body': content,
   } %}
@@ -184,5 +179,5 @@
 
 {# pass page_content to default page wrapper #}
 {% include '@pages/_page-default.twig' with {
-  'content': page_content
+  'content': page_content,
 } %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/event.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/event.twig
index ce69a4d0a7..7597f848c0 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/event.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/event.twig
@@ -72,8 +72,7 @@
 {% set page_content %}
   {% include '@templates/detail-pages/page.twig' with {
     'title': page_title,
-    'messages': page_messages,
-    'tasks': page_tasks,
+    'admin_info': page_admin_info,
     'intro': intro,
     'body': content,
   } %}
@@ -81,5 +80,5 @@
 
 {# pass page_content to default page wrapper #}
 {% include '@pages/_page-default.twig' with {
-  'content': page_content
+  'content': page_content,
 } %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/frequent-question.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/frequent-question.twig
index d2c1b3bdbb..edaace09ab 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/frequent-question.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/frequent-question.twig
@@ -48,5 +48,5 @@
 
 {# pass page_content to default page wrapper #}
 {% include '@pages/_page-default.twig' with {
-  'content': page_content
+  'content': page_content,
 } %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/news-release.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/news-release.twig
index 0d113d7e61..a18008f872 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/news-release.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/news-release.twig
@@ -37,8 +37,7 @@
 {% set page_content %}
   {% include '@templates/detail-pages/page.twig' with {
     'title': page_title,
-    'messages': page_messages,
-    'tasks': page_tasks,
+    'admin_info': page_admin_info,
     'intro': intro,
     'body': content,
   } %}
@@ -46,5 +45,5 @@
 
 {# pass page_content to default page wrapper #}
 {% include '@pages/_page-default.twig' with {
-  'content': page_content
+  'content': page_content,
 } %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/perspective-with-two-authors.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/perspective-with-two-authors.twig
index f982d2fe7e..53e5be7b84 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/perspective-with-two-authors.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/perspective-with-two-authors.twig
@@ -68,8 +68,7 @@
 {% set page_content %}
   {% include '@templates/detail-pages/page.twig' with {
     'title': page_title,
-    'messages': page_messages,
-    'tasks': page_tasks,
+    'admin_info': page_admin_info,
     'intro': intro,
     'body': content,
   } %}
@@ -77,5 +76,5 @@
 
 {# pass page_content to default page wrapper #}
 {% include '@pages/_page-default.twig' with {
-  'content': page_content
+  'content': page_content,
 } %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/perspective.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/perspective.twig
index a47d99a2a6..c2295344b1 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/perspective.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/perspective.twig
@@ -51,8 +51,7 @@
 {% set page_content %}
   {% include '@templates/detail-pages/page.twig' with {
     'title': page_title,
-    'messages': page_messages,
-    'tasks': page_tasks,
+    'admin_info': page_admin_info,
     'intro': intro,
     'body': content,
   } %}
@@ -60,5 +59,5 @@
 
 {# pass page_content to default page wrapper #}
 {% include '@pages/_page-default.twig' with {
-  'content': page_content
+  'content': page_content,
 } %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/public-notice.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/public-notice.twig
index d1ef085e47..40c1599442 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/public-notice.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/public-notice.twig
@@ -73,8 +73,7 @@
 {% set page_content %}
   {% include '@templates/detail-pages/page.twig' with {
     'title': page_title,
-    'messages': page_messages,
-    'tasks': page_tasks,
+    'admin_info': page_admin_info,
     'intro': intro,
     'body': content,
   } %}
@@ -82,5 +81,5 @@
 
 {# pass page_content to default page wrapper #}
 {% include '@pages/_page-default.twig' with {
-  'content': page_content
+  'content': page_content,
 } %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/regulation.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/regulation.twig
index f72febaa51..a53613403b 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/regulation.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/regulation.twig
@@ -112,8 +112,7 @@
 {% set page_content %}
   {% include '@templates/detail-pages/page.twig' with {
     'title': page_title,
-    'messages': page_messages,
-    'tasks': page_tasks,
+    'admin_info': page_admin_info,
     'intro': intro,
     'body': content,
   } %}
@@ -121,5 +120,5 @@
 
 {# pass page_content to default page wrapper #}
 {% include '@pages/_page-default.twig' with {
-  'content': page_content
+  'content': page_content,
 } %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/webform-with-sidenav.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/webform-with-sidenav.twig
index cac622c59c..e4f4e65db0 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/webform-with-sidenav.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/webform-with-sidenav.twig
@@ -121,5 +121,5 @@
 
 {# pass page_content to default page wrapper #}
 {% include '@pages/_page-default.twig' with {
-  'content': page_content
+  'content': page_content,
 } %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/webform.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/webform.twig
index ff50bb2aab..49b9809223 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/webform.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/detail-pages/webform.twig
@@ -11,17 +11,13 @@
   } %}
 {% endset %}
 
-{% set page_messages %}
+{% set page_admin_info %}
   {% if show_admin_info %}
     {% include '@uswds/alert/alert--success/alert--success.twig' with {
       'title': 'Status message',
       'content': '<p class="usa-alert__text">Basic page <em class="placeholder"><a href="#" hreflang="en">' ~ page_title ~ '</a></em> has been updated.</p>',
     } %}
-  {% endif %}
-{% endset %}
 
-{% set page_tasks %}
-  {% if show_admin_info %}
     {% include '@components/button-group/button-group--base/button-group--base.twig' with {
       'buttons': local_tasks,
     } %}
@@ -76,8 +72,7 @@
 {% set page_content %}
   {% include '@templates/detail-pages/page.twig' with {
     'title': page_title,
-    'messages': page_messages,
-    'tasks': page_tasks,
+    'admin_info': page_admin_info,
     'intro': intro,
     'body': content,
     'sidebar': sidebar,
@@ -86,5 +81,5 @@
 
 {# pass page_content to default page wrapper #}
 {% include '@pages/_page-default.twig' with {
-  'content': page_content
+  'content': page_content,
 } %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/listing-pages/frequent-questions.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/listing-pages/frequent-questions.twig
index 712a41e7c6..2262520734 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/listing-pages/frequent-questions.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/listing-pages/frequent-questions.twig
@@ -86,5 +86,5 @@
 
 {# pass page_content to default page wrapper #}
 {% include '@pages/_page-default.twig' with {
-  'content': page_content
+  'content': page_content,
 } %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/listing-pages/news-releases.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/listing-pages/news-releases.twig
index e21e848b5b..5bf7a23507 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/listing-pages/news-releases.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/listing-pages/news-releases.twig
@@ -102,5 +102,5 @@
 
 {# pass page_content to default page wrapper #}
 {% include '@pages/_page-default.twig' with {
-  'content': page_content
+  'content': page_content,
 } %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/listing-pages/perspectives.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/listing-pages/perspectives.twig
index 70a0a45491..49a07f63ae 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/listing-pages/perspectives.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/listing-pages/perspectives.twig
@@ -95,5 +95,5 @@
 
 {# pass page_content to default page wrapper #}
 {% include '@pages/_page-default.twig' with {
-  'content': page_content
+  'content': page_content,
 } %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/listing-pages/public-notices.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/listing-pages/public-notices.twig
index c2e8c53601..b0a457dbc8 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/listing-pages/public-notices.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/listing-pages/public-notices.twig
@@ -87,5 +87,5 @@
 
 {# pass page_content to default page wrapper #}
 {% include '@pages/_page-default.twig' with {
-  'content': page_content
+  'content': page_content,
 } %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/web-area-homepages/microsite.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/web-area-homepages/microsite.twig
index 71fa18b3cc..6ac8a92f9b 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/web-area-homepages/microsite.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/web-area-homepages/microsite.twig
@@ -5,17 +5,13 @@
   } %}
 {% endset %}
 
-{% set page_messages %}
+{% set page_admin_info %}
   {% if show_admin_info %}
     {% include '@uswds/alert/alert--success/alert--success.twig' with {
       'title': 'Status message',
       'content': '<p class="usa-alert__text">Basic page <em class="placeholder"><a href="#" hreflang="en">' ~ page_title ~ '</a></em> has been updated.</p>',
     } %}
-  {% endif %}
-{% endset %}
 
-{% set page_tasks %}
-  {% if show_admin_info %}
     {% include '@components/button-group/button-group--base/button-group--base.twig' with {
       'buttons': local_tasks,
     } %}
@@ -184,8 +180,7 @@
 {% set page_content %}
   {% include '@templates/web-area-homepages/microsite.twig' with {
     'title': page_title,
-    'messages': page_messages,
-    'tasks': page_tasks,
+    'admin_info': page_admin_info,
     'has_header': has_header,
     'slideshow': slideshow,
     'body': content,
@@ -194,5 +189,5 @@
 
 {# pass page_content to default page wrapper #}
 {% include '@pages/_page-default.twig' with {
-  'content': page_content
+  'content': page_content,
 } %}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/web-area-homepages/resource-directory.twig b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/web-area-homepages/resource-directory.twig
index 8848cb3d74..90463178bf 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/web-area-homepages/resource-directory.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/07-pages/web-area-homepages/resource-directory.twig
@@ -5,17 +5,13 @@
   } %}
 {% endset %}
 
-{% set page_messages %}
+{% set page_admin_info %}
   {% if show_admin_info %}
     {% include '@uswds/alert/alert--success/alert--success.twig' with {
       'title': 'Status message',
       'content': '<p class="usa-alert__text">Basic page <em class="placeholder"><a href="#" hreflang="en">' ~ page_title ~ '</a></em> has been updated.</p>',
     } %}
-  {% endif %}
-{% endset %}
 
-{% set page_tasks %}
-  {% if show_admin_info %}
     {% include '@components/button-group/button-group--base/button-group--base.twig' with {
       'buttons': local_tasks,
     } %}
@@ -137,8 +133,7 @@
 {% set page_content %}
   {% include '@templates/web-area-homepages/resource-directory.twig' with {
     'title': page_title,
-    'messages': page_messages,
-    'tasks': page_tasks,
+    'admin_info': page_admin_info,
     'has_header': has_header,
     'has_sidebar': has_sidebar,
     'main_top': main_top,
@@ -158,5 +153,5 @@
 
 {# pass page_content to default page wrapper #}
 {% include '@pages/_page-default.twig' with {
-  'content': page_content
+  'content': page_content,
 } %}
diff --git a/services/drupal/web/themes/epa_theme/templates/content/node--event--full.html.twig b/services/drupal/web/themes/epa_theme/templates/content/node--event--full.html.twig
index bfdf27bd4f..90a0d7b784 100644
--- a/services/drupal/web/themes/epa_theme/templates/content/node--event--full.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/content/node--event--full.html.twig
@@ -31,16 +31,17 @@
   {{ drupal_entity('block', 'webareaheader', check_access=false) }}
 {% endset %}
 
-{% set messages %}
-  {{ drupal_block('system_messages_block', wrapper=false) }}
-{% endset %}
-
-{% set local_tasks %}
-  {{ drupal_block('local_tasks_block', wrapper=false) }}
-  {{ drupal_block('local_actions_block', wrapper=false) }}
+{% set admin_info %}
+  {{ region_messages }}
   {{ content.epa_content_moderation_control }}
 {% endset %}
 
+{% set show_admin_info = false %}
+
+{% if admin_info|render|striptags|trim %}
+  {% set show_admin_info = true %}
+{% endif %}
+
 {% set footer %}
   {{ drupal_entity('block', 'webareafooter', check_access=false) }}
 {% endset %}
@@ -87,8 +88,8 @@
     'header_info': header_info,
     'contact_link': contact_link,
     'title': title,
-    'messages': messages,
-    'tasks': local_tasks,
+    'admin_info': admin_info,
+    'show_admin_info': show_admin_info,
     'body': body,
     'sidenav': sidenav,
     'footer': footer,
@@ -100,8 +101,8 @@
     'header_info': header_info,
     'contact_link': contact_link,
     'title': title,
-    'messages': messages,
-    'tasks': local_tasks,
+    'admin_info': admin_info,
+    'show_admin_info': show_admin_info,
     'body': body,
     'footer': footer,
   } %}
diff --git a/services/drupal/web/themes/epa_theme/templates/content/node--faq--full.html.twig b/services/drupal/web/themes/epa_theme/templates/content/node--faq--full.html.twig
index 20b58d029e..ce19fe6be3 100644
--- a/services/drupal/web/themes/epa_theme/templates/content/node--faq--full.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/content/node--faq--full.html.twig
@@ -36,16 +36,17 @@
   {{ drupal_entity('block', 'webareaheader', check_access=false) }}
 {% endset %}
 
-{% set messages %}
-  {{ drupal_block('system_messages_block', wrapper=false) }}
-{% endset %}
-
-{% set local_tasks %}
-  {{ drupal_block('local_tasks_block', wrapper=false) }}
-  {{ drupal_block('local_actions_block', wrapper=false) }}
+{% set admin_info %}
+  {{ region_messages }}
   {{ content.epa_content_moderation_control }}
 {% endset %}
 
+{% set show_admin_info = false %}
+
+{% if admin_info|render|striptags|trim %}
+  {% set show_admin_info = true %}
+{% endif %}
+
 {% set footer %}
   {{ drupal_entity('block', 'webareafooter', check_access=false) }}
 {% endset %}
@@ -74,8 +75,8 @@
     'header_info': header_info,
     'contact_link': contact_link,
     'title': content.field_question,
-    'messages': messages,
-    'tasks': local_tasks,
+    'admin_info': admin_info,
+    'show_admin_info': show_admin_info,
     'body': content|without('epa_content_moderation_control', 'field_question'),
     'sidenav': sidenav,
     'footer': footer,
@@ -87,8 +88,8 @@
     'header_info': header_info,
     'contact_link': contact_link,
     'title': content.field_question,
-    'messages': messages,
-    'tasks': local_tasks,
+    'admin_info': admin_info,
+    'show_admin_info': show_admin_info,
     'body': content|without('epa_content_moderation_control', 'field_question'),
     'footer': footer,
   } %}
diff --git a/services/drupal/web/themes/epa_theme/templates/content/node--full.html.twig b/services/drupal/web/themes/epa_theme/templates/content/node--full.html.twig
index d3a57fa8dd..2696b52c9a 100644
--- a/services/drupal/web/themes/epa_theme/templates/content/node--full.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/content/node--full.html.twig
@@ -36,16 +36,17 @@
   {{ drupal_entity('block', 'webareaheader', check_access=false) }}
 {% endset %}
 
-{% set messages %}
-  {{ drupal_block('system_messages_block', wrapper=false) }}
-{% endset %}
-
-{% set local_tasks %}
-  {{ drupal_block('local_tasks_block', wrapper=false) }}
-  {{ drupal_block('local_actions_block', wrapper=false) }}
+{% set admin_info %}
+  {{ region_messages }}
   {{ content.epa_content_moderation_control }}
 {% endset %}
 
+{% set show_admin_info = false %}
+
+{% if admin_info|render|striptags|trim %}
+  {% set show_admin_info = true %}
+{% endif %}
+
 {% set footer %}
   {{ drupal_entity('block', 'webareafooter', check_access=false) }}
 {% endset %}
@@ -74,8 +75,8 @@
     'header_info': header_info,
     'contact_link': contact_link,
     'title': label,
-    'messages': messages,
-    'tasks': local_tasks,
+    'admin_info': admin_info,
+    'show_admin_info': show_admin_info,
     'body': content|without('epa_content_moderation_control'),
     'sidenav': sidenav,
     'footer': footer,
@@ -87,8 +88,8 @@
     'header_info': header_info,
     'contact_link': contact_link,
     'title': label,
-    'messages': messages,
-    'tasks': local_tasks,
+    'admin_info': admin_info,
+    'show_admin_info': show_admin_info,
     'body': content|without('epa_content_moderation_control'),
     'footer': footer,
   } %}
diff --git a/services/drupal/web/themes/epa_theme/templates/content/node--news-release--full.html.twig b/services/drupal/web/themes/epa_theme/templates/content/node--news-release--full.html.twig
index 302640b76d..e2a792cd6a 100644
--- a/services/drupal/web/themes/epa_theme/templates/content/node--news-release--full.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/content/node--news-release--full.html.twig
@@ -34,16 +34,17 @@
   {{ drupal_entity('block', 'webareaheader', check_access=false) }}
 {% endset %}
 
-{% set messages %}
-  {{ drupal_block('system_messages_block', wrapper=false) }}
-{% endset %}
-
-{% set local_tasks %}
-  {{ drupal_block('local_tasks_block', wrapper=false) }}
-  {{ drupal_block('local_actions_block', wrapper=false) }}
+{% set admin_info %}
+  {{ region_messages }}
   {{ content.epa_content_moderation_control }}
 {% endset %}
 
+{% set show_admin_info = false %}
+
+{% if admin_info|render|striptags|trim %}
+  {% set show_admin_info = true %}
+{% endif %}
+
 {% set footer %}
   {{ drupal_entity('block', 'webareafooter', check_access=false) }}
 {% endset %}
@@ -82,8 +83,8 @@
     'header_info': header_info,
     'contact_link': contact_link,
     'title': label,
-    'messages': messages,
-    'tasks': local_tasks,
+    'admin_info': admin_info,
+    'show_admin_info': show_admin_info,
     'body': body,
     'sidenav': sidenav,
     'footer': footer,
@@ -95,8 +96,8 @@
     'header_info': header_info,
     'contact_link': contact_link,
     'title': label,
-    'messages': messages,
-    'tasks': local_tasks,
+    'admin_info': admin_info,
+    'show_admin_info': show_admin_info,
     'body': body,
     'footer': footer,
   } %}
diff --git a/services/drupal/web/themes/epa_theme/templates/content/node--perspective--full.html.twig b/services/drupal/web/themes/epa_theme/templates/content/node--perspective--full.html.twig
index eaadce9dba..d1f8a90a55 100644
--- a/services/drupal/web/themes/epa_theme/templates/content/node--perspective--full.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/content/node--perspective--full.html.twig
@@ -29,16 +29,17 @@
   {{ drupal_entity('block', 'webareaheader', check_access=false) }}
 {% endset %}
 
-{% set messages %}
-  {{ drupal_block('system_messages_block', wrapper=false) }}
-{% endset %}
-
-{% set local_tasks %}
-  {{ drupal_block('local_tasks_block', wrapper=false) }}
-  {{ drupal_block('local_actions_block', wrapper=false) }}
+{% set admin_info %}
+  {{ region_messages }}
   {{ content.epa_content_moderation_control }}
 {% endset %}
 
+{% set show_admin_info = false %}
+
+{% if admin_info|render|striptags|trim %}
+  {% set show_admin_info = true %}
+{% endif %}
+
 {% set footer %}
   {{ drupal_entity('block', 'webareafooter', check_access=false) }}
 {% endset %}
@@ -67,8 +68,8 @@
     'header_info': header_info,
     'contact_link': contact_link,
     'title': label,
-    'messages': messages,
-    'tasks': local_tasks,
+    'admin_info': admin_info,
+    'show_admin_info': show_admin_info,
     'body': content|without('epa_content_moderation_control'),
     'sidenav': sidenav,
     'footer': footer,
@@ -80,8 +81,8 @@
     'header_info': header_info,
     'contact_link': contact_link,
     'title': label,
-    'messages': messages,
-    'tasks': local_tasks,
+    'admin_info': admin_info,
+    'show_admin_info': show_admin_info,
     'body': content|without('epa_content_moderation_control'),
     'footer': footer,
   } %}
diff --git a/services/drupal/web/themes/epa_theme/templates/content/node--public-notice--full.html.twig b/services/drupal/web/themes/epa_theme/templates/content/node--public-notice--full.html.twig
index 31a49fc0f7..f74cdc509f 100644
--- a/services/drupal/web/themes/epa_theme/templates/content/node--public-notice--full.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/content/node--public-notice--full.html.twig
@@ -31,16 +31,17 @@
   {{ drupal_entity('block', 'webareaheader', check_access=false) }}
 {% endset %}
 
-{% set messages %}
-  {{ drupal_block('system_messages_block', wrapper=false) }}
-{% endset %}
-
-{% set local_tasks %}
-  {{ drupal_block('local_tasks_block', wrapper=false) }}
-  {{ drupal_block('local_actions_block', wrapper=false) }}
+{% set admin_info %}
+  {{ region_messages }}
   {{ content.epa_content_moderation_control }}
 {% endset %}
 
+{% set show_admin_info = false %}
+
+{% if admin_info|render|striptags|trim %}
+  {% set show_admin_info = true %}
+{% endif %}
+
 {% set footer %}
   {{ drupal_entity('block', 'webareafooter', check_access=false) }}
 {% endset %}
@@ -99,8 +100,8 @@
     'header_info': header_info,
     'contact_link': contact_link,
     'title': title,
-    'messages': messages,
-    'tasks': local_tasks,
+    'admin_info': admin_info,
+    'show_admin_info': show_admin_info,
     'body': body,
     'sidenav': sidenav,
     'footer': footer,
@@ -112,8 +113,8 @@
     'header_info': header_info,
     'contact_link': contact_link,
     'title': title,
-    'messages': messages,
-    'tasks': local_tasks,
+    'admin_info': admin_info,
+    'show_admin_info': show_admin_info,
     'body': body,
     'footer': footer,
   } %}
diff --git a/services/drupal/web/themes/epa_theme/templates/content/node--regulation--full.html.twig b/services/drupal/web/themes/epa_theme/templates/content/node--regulation--full.html.twig
index 2a62980e91..bba36a8feb 100644
--- a/services/drupal/web/themes/epa_theme/templates/content/node--regulation--full.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/content/node--regulation--full.html.twig
@@ -31,16 +31,17 @@
   {{ drupal_entity('block', 'webareaheader', check_access=false) }}
 {% endset %}
 
-{% set messages %}
-  {{ drupal_block('system_messages_block', wrapper=false) }}
-{% endset %}
-
-{% set local_tasks %}
-  {{ drupal_block('local_tasks_block', wrapper=false) }}
-  {{ drupal_block('local_actions_block', wrapper=false) }}
+{% set admin_info %}
+  {{ region_messages }}
   {{ content.epa_content_moderation_control }}
 {% endset %}
 
+{% set show_admin_info = false %}
+
+{% if admin_info|render|striptags|trim %}
+  {% set show_admin_info = true %}
+{% endif %}
+
 {% set footer %}
   {{ drupal_entity('block', 'webareafooter', check_access=false) }}
 {% endset %}
@@ -122,8 +123,8 @@
     'header_info': header_info,
     'contact_link': contact_link,
     'title': label,
-    'messages': messages,
-    'tasks': local_tasks,
+    'admin_info': admin_info,
+    'show_admin_info': show_admin_info,
     'body': body,
     'sidenav': sidenav,
     'footer': footer,
@@ -135,8 +136,8 @@
     'header_info': header_info,
     'contact_link': contact_link,
     'title': label,
-    'messages': messages,
-    'tasks': local_tasks,
+    'admin_info': admin_info,
+    'show_admin_info': show_admin_info,
     'body': body,
     'footer': footer,
   } %}
diff --git a/services/drupal/web/themes/epa_theme/templates/content/node--web-area.html.twig b/services/drupal/web/themes/epa_theme/templates/content/node--web-area.html.twig
index a9b1837477..a0e445213b 100644
--- a/services/drupal/web/themes/epa_theme/templates/content/node--web-area.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/content/node--web-area.html.twig
@@ -20,16 +20,17 @@
   {{ drupal_entity('block', 'webareaheader', check_access=false) }}
 {% endset %}
 
-{% set messages %}
-  {{ drupal_block('system_messages_block', wrapper=false) }}
-{% endset %}
-
-{% set local_tasks %}
-  {{ drupal_block('local_tasks_block', wrapper=false) }}
-  {{ drupal_block('local_actions_block', wrapper=false) }}
+{% set admin_info %}
+  {{ region_messages }}
   {{ content.epa_content_moderation_control }}
 {% endset %}
 
+{% set show_admin_info = false %}
+
+{% if admin_info|render|striptags|trim %}
+  {% set show_admin_info = true %}
+{% endif %}
+
 {% set footer %}
   {{ drupal_entity('block', 'webareafooter', check_access=false) }}
 {% endset %}
@@ -66,8 +67,8 @@
   'header_info': header_info,
   'contact_link': contact_link,
   'title': label,
-  'messages': messages,
-  'tasks': local_tasks,
+  'admin': admin_info,
+  'show_admin_info': show_admin_info,
   'slideshow': slideshow,
   'body': body,
   'footer': footer,
diff --git a/services/drupal/web/themes/epa_theme/templates/views/views-view--search-faqs.html.twig b/services/drupal/web/themes/epa_theme/templates/views/views-view--search-faqs.html.twig
index 84c2e2d841..75239b165c 100644
--- a/services/drupal/web/themes/epa_theme/templates/views/views-view--search-faqs.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/views/views-view--search-faqs.html.twig
@@ -15,15 +15,18 @@
   {{ drupal_entity('block', 'webareaheader', check_access=false) }}
 {% endset %}
 
-{% set messages %}
+{% set admin_info %}
   {{ drupal_block('system_messages_block', wrapper=false) }}
-{% endset %}
-
-{% set local_tasks %}
   {{ drupal_block('local_tasks_block', wrapper=false) }}
   {{ drupal_block('local_actions_block', wrapper=false) }}
 {% endset %}
 
+{% set show_admin_info = false %}
+
+{% if admin_info|render|striptags|trim %}
+  {% set show_admin_info = true %}
+{% endif %}
+
 {% set area_footer %}
   {{ drupal_entity('block', 'webareafooter', check_access=false) }}
 {% endset %}
@@ -70,8 +73,8 @@
   'contact_link': contact_link,
   'title': view.title,
   'contextual_links': title_suffix.contextual_links,
-  'messages': messages,
-  'tasks': local_tasks,
+  'admin_info': admin_info,
+  'show_admin_info': show_admin_info,
   'intro': intro,
   'search': search,
   'filters': filters,
diff --git a/services/drupal/web/themes/epa_theme/templates/views/views-view--search-news-releases.html.twig b/services/drupal/web/themes/epa_theme/templates/views/views-view--search-news-releases.html.twig
index 1564eb87a5..0f8d0cb7a5 100644
--- a/services/drupal/web/themes/epa_theme/templates/views/views-view--search-news-releases.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/views/views-view--search-news-releases.html.twig
@@ -15,15 +15,18 @@
   {{ drupal_entity('block', 'webareaheader', check_access=false) }}
 {% endset %}
 
-{% set messages %}
+{% set admin_info %}
   {{ drupal_block('system_messages_block', wrapper=false) }}
-{% endset %}
-
-{% set local_tasks %}
   {{ drupal_block('local_tasks_block', wrapper=false) }}
   {{ drupal_block('local_actions_block', wrapper=false) }}
 {% endset %}
 
+{% set show_admin_info = false %}
+
+{% if admin_info|render|striptags|trim %}
+  {% set show_admin_info = true %}
+{% endif %}
+
 {% set area_footer %}
   {{ drupal_entity('block', 'webareafooter', check_access=false) }}
 {% endset %}
@@ -75,8 +78,8 @@
   'contact_link': contact_link,
   'title': view.title,
   'contextual_links': title_suffix.contextual_links,
-  'messages': messages,
-  'tasks': local_tasks,
+  'admin_info': admin_info,
+  'show_admin_info': show_admin_info,
   'intro': intro,
   'search': search,
   'filters': filters,
diff --git a/services/drupal/web/themes/epa_theme/templates/views/views-view--search-perspectives.html.twig b/services/drupal/web/themes/epa_theme/templates/views/views-view--search-perspectives.html.twig
index a66f8e5eda..b37b50a88d 100644
--- a/services/drupal/web/themes/epa_theme/templates/views/views-view--search-perspectives.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/views/views-view--search-perspectives.html.twig
@@ -15,15 +15,18 @@
   {{ drupal_entity('block', 'webareaheader', check_access=false) }}
 {% endset %}
 
-{% set messages %}
+{% set admin_info %}
   {{ drupal_block('system_messages_block', wrapper=false) }}
-{% endset %}
-
-{% set local_tasks %}
   {{ drupal_block('local_tasks_block', wrapper=false) }}
   {{ drupal_block('local_actions_block', wrapper=false) }}
 {% endset %}
 
+{% set show_admin_info = false %}
+
+{% if admin_info|render|striptags|trim %}
+  {% set show_admin_info = true %}
+{% endif %}
+
 {% set area_footer %}
   {{ drupal_entity('block', 'webareafooter', check_access=false) }}
 {% endset %}
@@ -73,8 +76,8 @@
   'contact_link': contact_link,
   'title': view.title,
   'contextual_links': title_suffix.contextual_links,
-  'messages': messages,
-  'tasks': local_tasks,
+  'admin_info': admin_info,
+  'show_admin_info': show_admin_info,
   'intro': intro,
   'search': search,
   'filters': filters,
diff --git a/services/drupal/web/themes/epa_theme/templates/views/views-view--search-public-notices.html.twig b/services/drupal/web/themes/epa_theme/templates/views/views-view--search-public-notices.html.twig
index bb5f432611..ec1e21af74 100644
--- a/services/drupal/web/themes/epa_theme/templates/views/views-view--search-public-notices.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/views/views-view--search-public-notices.html.twig
@@ -15,15 +15,18 @@
   {{ drupal_entity('block', 'webareaheader', check_access=false) }}
 {% endset %}
 
-{% set messages %}
+{% set admin_info %}
   {{ drupal_block('system_messages_block', wrapper=false) }}
-{% endset %}
-
-{% set local_tasks %}
   {{ drupal_block('local_tasks_block', wrapper=false) }}
   {{ drupal_block('local_actions_block', wrapper=false) }}
 {% endset %}
 
+{% set show_admin_info = false %}
+
+{% if admin_info|render|striptags|trim %}
+  {% set show_admin_info = true %}
+{% endif %}
+
 {% set area_footer %}
   {{ drupal_entity('block', 'webareafooter', check_access=false) }}
 {% endset %}
@@ -74,8 +77,8 @@
   'contact_link': contact_link,
   'title': view.title,
   'contextual_links': title_suffix.contextual_links,
-  'messages': messages,
-  'tasks': local_tasks,
+  'admin_info': admin_info,
+  'show_admin_info': show_admin_info,
   'intro': intro,
   'search': search,
   'filters': filters,

From 393e01843f29cffab2dbd1e1f90e89631f9e43f0 Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Mon, 20 Dec 2021 12:48:25 -0500
Subject: [PATCH 32/87] EPAD8-1552: Update block templates

---
 .../block/block--admin-no-label.html.twig     | 35 +++++++++++++++++++
 .../templates/block/block--admin.html.twig    | 35 +++++++++++++++++++
 .../block/block--custom-html.html.twig        | 30 +++-------------
 .../block/block--facets-summary.html.twig     | 30 +++-------------
 .../templates/block/block--facets.html.twig   | 30 +++-------------
 .../block/block--globalfooter.html.twig       |  9 +++--
 .../block/block--layout-builder.html.twig     | 35 +++----------------
 .../block/block--local-tasks-block.html.twig  |  7 ++++
 .../block/block--paragraph.html.twig          | 35 +++----------------
 .../block/block--system-main-block.html.twig  | 31 +++-------------
 .../block/block--system-menu-block.html.twig  | 28 +++------------
 .../templates/block/block--system.html.twig   |  7 ++++
 ...lock--views-exposed-filter-block.html.twig | 30 +++-------------
 .../block/block--webareafooter.html.twig      | 30 +++-------------
 .../block/block--webareaheader.html.twig      | 30 +++-------------
 .../block/block--webareamenu.html.twig        | 33 +++--------------
 16 files changed, 143 insertions(+), 292 deletions(-)
 create mode 100644 services/drupal/web/themes/epa_theme/templates/block/block--admin-no-label.html.twig
 create mode 100644 services/drupal/web/themes/epa_theme/templates/block/block--admin.html.twig
 create mode 100644 services/drupal/web/themes/epa_theme/templates/block/block--local-tasks-block.html.twig
 create mode 100644 services/drupal/web/themes/epa_theme/templates/block/block--system.html.twig

diff --git a/services/drupal/web/themes/epa_theme/templates/block/block--admin-no-label.html.twig b/services/drupal/web/themes/epa_theme/templates/block/block--admin-no-label.html.twig
new file mode 100644
index 0000000000..4f1a1bc389
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/templates/block/block--admin-no-label.html.twig
@@ -0,0 +1,35 @@
+{#
+/**
+ * @file
+ * Theme for an admin block.
+ *
+ * This block template gets extended by blocks that should only show the wrapper
+ * when a user is logged in.
+ */
+#}
+{% set classes = [
+  'margin-0',
+] %}
+
+{% set attributes = attributes.addClass(classes) %}
+
+{% set block_content %}
+  {% block block_content %}
+    {{ content }}
+  {% endblock %}
+{% endset %}
+
+{% embed '@components/block/block.twig' with {
+  'hide_wrapper': not logged_in,
+  'has_constrain': false,
+  'title_prefix': title_prefix,
+  'label': false,
+  'title_suffix': title_suffix,
+  'hide_content_wrapper': true,
+} %}
+
+  {% block content %}
+    {{ block_content }}
+  {% endblock %}
+
+{% endembed %}
diff --git a/services/drupal/web/themes/epa_theme/templates/block/block--admin.html.twig b/services/drupal/web/themes/epa_theme/templates/block/block--admin.html.twig
new file mode 100644
index 0000000000..f9b797eb6c
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/templates/block/block--admin.html.twig
@@ -0,0 +1,35 @@
+{#
+/**
+ * @file
+ * Theme for an admin block.
+ *
+ * This block template gets extended by blocks that should only show the wrapper
+ * when a user is logged in.
+ */
+#}
+{% set classes = [
+  'margin-0',
+] %}
+
+{% set attributes = attributes.addClass(classes) %}
+
+{% set block_content %}
+  {% block block_content %}
+    {{ content }}
+  {% endblock %}
+{% endset %}
+
+{% embed '@components/block/block.twig' with {
+  'hide_wrapper': not logged_in,
+  'has_constrain': false,
+  'title_prefix': title_prefix,
+  'label': label,
+  'title_suffix': title_suffix,
+  'hide_content_wrapper': true,
+} %}
+
+  {% block content %}
+    {{ block_content }}
+  {% endblock %}
+
+{% endembed %}
diff --git a/services/drupal/web/themes/epa_theme/templates/block/block--custom-html.html.twig b/services/drupal/web/themes/epa_theme/templates/block/block--custom-html.html.twig
index 7e13890ada..696713c97e 100644
--- a/services/drupal/web/themes/epa_theme/templates/block/block--custom-html.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/block/block--custom-html.html.twig
@@ -1,27 +1,7 @@
 {#
- /**
-  * @file
-  * Theme override for a custom html block.
-  */
+/**
+ * @file
+ * Theme override for a custom html block.
+ */
 #}
-
-{% set classes = [
-  'margin-0',
-] %}
-
-{% set attributes = attributes.addClass(classes) %}
-
-{% embed '@components/block/block.twig' with {
-  'hide_wrapper': not logged_in,
-  'has_constrain': false,
-  'title_prefix': title_prefix,
-  'label': false,
-  'title_suffix': title_suffix,
-  'hide_content_wrapper': true,
-} %}
-
-  {% block content %}
-    {{ content }}
-  {% endblock %}
-
-{% endembed %}
+{% extends "block--admin-no-label.html.twig" %}
diff --git a/services/drupal/web/themes/epa_theme/templates/block/block--facets-summary.html.twig b/services/drupal/web/themes/epa_theme/templates/block/block--facets-summary.html.twig
index 94372d6b5e..bcb9712d35 100644
--- a/services/drupal/web/themes/epa_theme/templates/block/block--facets-summary.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/block/block--facets-summary.html.twig
@@ -1,27 +1,7 @@
 {#
- /**
-  * @file
-  * Theme override for the facets summary block.
-  */
+/**
+ * @file
+ * Theme override for the facets summary block.
+ */
 #}
-
-{% set classes = [
-  'margin-0',
-] %}
-
-{% set attributes = attributes.addClass(classes) %}
-
-{% embed '@components/block/block.twig' with {
-  'hide_wrapper': not logged_in,
-  'has_constrain': false,
-  'title_prefix': title_prefix,
-  'label': false,
-  'title_suffix': title_suffix,
-  'hide_content_wrapper': true,
-} %}
-
-  {% block content %}
-    {{ content }}
-  {% endblock %}
-
-{% endembed %}
+{% extends "block--admin-no-label.html.twig" %}
diff --git a/services/drupal/web/themes/epa_theme/templates/block/block--facets.html.twig b/services/drupal/web/themes/epa_theme/templates/block/block--facets.html.twig
index 9280fac9b3..af96b63380 100644
--- a/services/drupal/web/themes/epa_theme/templates/block/block--facets.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/block/block--facets.html.twig
@@ -1,27 +1,7 @@
 {#
- /**
-  * @file
-  * Theme override for the facets block.
-  */
+/**
+ * @file
+ * Theme override for the facets block.
+ */
 #}
-
-{% set classes = [
-  'margin-0',
-] %}
-
-{% set attributes = attributes.addClass(classes) %}
-
-{% embed '@components/block/block.twig' with {
-  'hide_wrapper': not logged_in,
-  'has_constrain': false,
-  'title_prefix': title_prefix,
-  'label': false,
-  'title_suffix': title_suffix,
-  'hide_content_wrapper': true,
-} %}
-
-  {% block content %}
-    {{ content }}
-  {% endblock %}
-
-{% endembed %}
+{% extends "block--admin-no-label.html.twig" %}
diff --git a/services/drupal/web/themes/epa_theme/templates/block/block--globalfooter.html.twig b/services/drupal/web/themes/epa_theme/templates/block/block--globalfooter.html.twig
index 5285bb841a..f7020f2543 100644
--- a/services/drupal/web/themes/epa_theme/templates/block/block--globalfooter.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/block/block--globalfooter.html.twig
@@ -1,9 +1,8 @@
 {#
- /**
-  * @file
-  * Theme override for the global footer block.
-  */
+/**
+ * @file
+ * Theme override for the global footer block.
+ */
 #}
-
 {{ title_suffix.contextual_links }}
 {{ content }}
diff --git a/services/drupal/web/themes/epa_theme/templates/block/block--layout-builder.html.twig b/services/drupal/web/themes/epa_theme/templates/block/block--layout-builder.html.twig
index f948866ad5..cf9deaf1a9 100644
--- a/services/drupal/web/themes/epa_theme/templates/block/block--layout-builder.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/block/block--layout-builder.html.twig
@@ -1,32 +1,7 @@
 {#
- /**
-  * @file
-  * Theme override for a layout builder block.
-  */
+/**
+ * @file
+ * Theme override for a layout builder block.
+ */
 #}
-
-{% set classes = [
-  'margin-0',
-] %}
-
-{% set attributes = attributes.addClass(classes) %}
-
-{% if label is not empty %}
-  {% embed '@components/block/block.twig' with {
-    'hide_wrapper': not logged_in,
-    'has_constrain': false,
-    'hide_content_wrapper': true,
-    'title_prefix': title_prefix,
-    'title_suffix': title_suffix,
-    'label': label,
-  } %}
-
-    {% block content %}
-      {{ content }}
-    {% endblock %}
-
-  {% endembed %}
-
-{% else %}
-  {{ content }}
-{% endif %}
+{% extends "block--admin.html.twig" %}
diff --git a/services/drupal/web/themes/epa_theme/templates/block/block--local-tasks-block.html.twig b/services/drupal/web/themes/epa_theme/templates/block/block--local-tasks-block.html.twig
new file mode 100644
index 0000000000..3112d7f620
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/templates/block/block--local-tasks-block.html.twig
@@ -0,0 +1,7 @@
+{#
+/**
+ * @file
+ * Theme override for a local tasks block.
+ */
+#}
+{% extends "block--admin-no-label.html.twig" %}
diff --git a/services/drupal/web/themes/epa_theme/templates/block/block--paragraph.html.twig b/services/drupal/web/themes/epa_theme/templates/block/block--paragraph.html.twig
index 1dc9241f07..ae66d5d50c 100644
--- a/services/drupal/web/themes/epa_theme/templates/block/block--paragraph.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/block/block--paragraph.html.twig
@@ -1,32 +1,7 @@
 {#
- /**
-  * @file
-  * Theme override for a paragraph block.
-  */
+/**
+ * @file
+ * Theme override for a paragraph block.
+ */
 #}
-
-{% set classes = [
-  'margin-0',
-] %}
-
-{% set attributes = attributes.addClass(classes) %}
-
-{% if label is not empty %}
-  {% embed '@components/block/block.twig' with {
-    'hide_wrapper': not logged_in,
-    'has_constrain': false,
-    'hide_content_wrapper': true,
-    'title_prefix': title_prefix,
-    'title_suffix': title_suffix,
-    'label': label,
-  } %}
-
-    {% block content %}
-      {{ content }}
-    {% endblock %}
-
-  {% endembed %}
-
-{% else %}
-  {{ content }}
-{% endif %}
+{% extends "block--admin.html.twig" %}
diff --git a/services/drupal/web/themes/epa_theme/templates/block/block--system-main-block.html.twig b/services/drupal/web/themes/epa_theme/templates/block/block--system-main-block.html.twig
index d1cc142e89..5377274a8e 100644
--- a/services/drupal/web/themes/epa_theme/templates/block/block--system-main-block.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/block/block--system-main-block.html.twig
@@ -1,28 +1,7 @@
 {#
- /**
-  * @file
-  * Theme override for a main block.
-  */
+/**
+ * @file
+ * Theme override for a main block.
+ */
 #}
-
-{% set classes = [
-  'block',
-  'block--provider-' ~ configuration.provider|clean_class,
-  'block--id-' ~ plugin_id|clean_class,
-  'margin-0',
-] %}
-
-{% set attributes = attributes.addClass(classes) %}
-
-{% embed '@components/block/block.twig' with {
-  'hide_wrapper': not logged_in,
-  'has_constrain': false,
-  'hide_content_wrapper': true,
-  'label': false,
-} %}
-
-  {% block content %}
-    {{ content }}
-  {% endblock %}
-
-{% endembed %}
+{% extends "block--admin-no-label.html.twig" %}
diff --git a/services/drupal/web/themes/epa_theme/templates/block/block--system-menu-block.html.twig b/services/drupal/web/themes/epa_theme/templates/block/block--system-menu-block.html.twig
index 27b776cf74..33c86c705f 100644
--- a/services/drupal/web/themes/epa_theme/templates/block/block--system-menu-block.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/block/block--system-menu-block.html.twig
@@ -1,25 +1,7 @@
 {#
- /**
-  * @file
-  * Theme override for a menu block.
-  */
+/**
+ * @file
+ * Theme override for a menu block.
+ */
 #}
-
-{% set classes = [
-  'margin-0',
-] %}
-
-{% set attributes = attributes.addClass(classes) %}
-
-{% embed '@components/block/block.twig' with {
-  'hide_wrapper': not logged_in,
-  'has_constrain': false,
-  'hide_content_wrapper': true,
-  'label': false,
-} %}
-
-  {% block content %}
-    {{ content }}
-  {% endblock %}
-
-{% endembed %}
+{% extends "block--admin-no-label.html.twig" %}
diff --git a/services/drupal/web/themes/epa_theme/templates/block/block--system.html.twig b/services/drupal/web/themes/epa_theme/templates/block/block--system.html.twig
new file mode 100644
index 0000000000..a2ac2326bb
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/templates/block/block--system.html.twig
@@ -0,0 +1,7 @@
+{#
+/**
+ * @file
+ * Theme override for a system block.
+ */
+#}
+{% extends "block--admin.html.twig" %}
diff --git a/services/drupal/web/themes/epa_theme/templates/block/block--views-exposed-filter-block.html.twig b/services/drupal/web/themes/epa_theme/templates/block/block--views-exposed-filter-block.html.twig
index ab2b5989af..b69d4de48f 100644
--- a/services/drupal/web/themes/epa_theme/templates/block/block--views-exposed-filter-block.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/block/block--views-exposed-filter-block.html.twig
@@ -1,27 +1,7 @@
 {#
- /**
-  * @file
-  * Theme override for a views exposed filter block.
-  */
+/**
+ * @file
+ * Theme override for a views exposed filter block.
+ */
 #}
-
-{% set classes = [
-  'margin-0',
-] %}
-
-{% set attributes = attributes.addClass(classes) %}
-
-{% embed '@components/block/block.twig' with {
-  'hide_wrapper': not logged_in,
-  'has_constrain': false,
-  'title_prefix': title_prefix,
-  'label': false,
-  'title_suffix': title_suffix,
-  'hide_content_wrapper': true,
-} %}
-
-  {% block content %}
-    {{ content }}
-  {% endblock %}
-
-{% endembed %}
+{% extends "block--admin-no-label.html.twig" %}
diff --git a/services/drupal/web/themes/epa_theme/templates/block/block--webareafooter.html.twig b/services/drupal/web/themes/epa_theme/templates/block/block--webareafooter.html.twig
index 69ac811c2b..b7de6db37d 100644
--- a/services/drupal/web/themes/epa_theme/templates/block/block--webareafooter.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/block/block--webareafooter.html.twig
@@ -1,27 +1,7 @@
 {#
- /**
-  * @file
-  * Theme override for the web area footer block.
-  */
+/**
+ * @file
+ * Theme override for the web area footer block.
+ */
 #}
-
-{% set classes = [
-  'margin-0',
-] %}
-
-{% set attributes = attributes.addClass(classes) %}
-
-{% embed '@components/block/block.twig' with {
-  'hide_wrapper': not logged_in,
-  'has_constrain': false,
-  'title_prefix': title_prefix,
-  'label': false,
-  'title_suffix': title_suffix,
-  'hide_content_wrapper': true,
-} %}
-
-  {% block content %}
-    {{ content }}
-  {% endblock %}
-
-{% endembed %}
+{% extends "block--admin-no-label.html.twig" %}
diff --git a/services/drupal/web/themes/epa_theme/templates/block/block--webareaheader.html.twig b/services/drupal/web/themes/epa_theme/templates/block/block--webareaheader.html.twig
index 4f31af566d..9e6870d708 100644
--- a/services/drupal/web/themes/epa_theme/templates/block/block--webareaheader.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/block/block--webareaheader.html.twig
@@ -1,27 +1,7 @@
 {#
- /**
-  * @file
-  * Theme override for the web area header block.
-  */
+/**
+ * @file
+ * Theme override for the web area header block.
+ */
 #}
-
-{% set classes = [
-  'margin-0',
-] %}
-
-{% set attributes = attributes.addClass(classes) %}
-
-{% embed '@components/block/block.twig' with {
-  'hide_wrapper': not logged_in,
-  'has_constrain': false,
-  'title_prefix': title_prefix,
-  'label': false,
-  'title_suffix': title_suffix,
-  'hide_content_wrapper': true,
-} %}
-
-  {% block content %}
-    {{ content }}
-  {% endblock %}
-
-{% endembed %}
+{% extends "block--admin-no-label.html.twig" %}
diff --git a/services/drupal/web/themes/epa_theme/templates/block/block--webareamenu.html.twig b/services/drupal/web/themes/epa_theme/templates/block/block--webareamenu.html.twig
index 7dc9503bc2..9c4510571c 100644
--- a/services/drupal/web/themes/epa_theme/templates/block/block--webareamenu.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/block/block--webareamenu.html.twig
@@ -1,30 +1,7 @@
 {#
- /**
-  * @file
-  * Theme override for the group menus block.
-  */
+/**
+ * @file
+ * Theme override for the group menus block.
+ */
 #}
-
-{% set classes = [
-  'margin-0',
-] %}
-
-{% set attributes = attributes.addClass(classes) %}
-
-{% if logged_in %}
-  {% embed '@components/block/block.twig' with {
-    'hide_wrapper': not logged_in,
-    'has_constrain': false,
-    'hide_content_wrapper': true,
-    'title_prefix': title_prefix,
-    'title_suffix': title_suffix,
-  } %}
-
-    {% block content %}
-      {{ content }}
-    {% endblock %}
-
-  {% endembed %}
-{% else %}
-  {{ content }}
-{% endif %}
+{% extends "block--admin.html.twig" %}

From 9000e89b18dc630c4fbfa85852c7875fdb9201c5 Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Mon, 20 Dec 2021 13:43:52 -0500
Subject: [PATCH 33/87] EPAD8-1567: Add more examples for external links

---
 .../05-components/external-link/external-link.twig     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/external-link.twig b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/external-link.twig
index d51b59f975..a2f9ec43c2 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/external-link.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/external-link/external-link.twig
@@ -16,12 +16,22 @@
   <div><a href="example.com">example.com</a></div>
   <div><a href="example.com/something">example.com/something</a></div>
   <div><a href="example.com/something#anchor">example.com/something#anchor</a></div>
+  <div><a href="example.com/something.gov">example.com/something.gov</a></div>
+  <div><a href="example.com/something.gov.tw">example.com/something.gov.tw</a></div>
+  <div><a href="example.com/something.gov/else">example.com/something.gov/else</a></div>
+  <div><a href="example.com/something.gov.tw/else">example.com/something.gov.tw/else</a></div>
   <div><a href="example.gov">example.gov</a></div>
   <div><a href="example.gov/something">example.gov/something</a></div>
   <div><a href="example.gov/something#anchor">example.gov/something#anchor</a></div>
+  <div><a href="example.gov.tw">example.gov.tw</a></div>
+  <div><a href="example.gov.tw/something">example.gov.tw/something</a></div>
+  <div><a href="example.gov.tw/something#anchor">example.gov.tw/something#anchor</a></div>
   <div><a href="example.mil">example.mil</a></div>
   <div><a href="example.mil/something">example.mil/something</a></div>
   <div><a href="example.mil/something#anchor">example.mil/something#anchor</a></div>
+  <div><a href="example.mil.tw">example.mil.tw</a></div>
+  <div><a href="example.mil.tw/something">example.mil.tw/something</a></div>
+  <div><a href="example.mil.tw/something#anchor">example.mil.tw/something#anchor</a></div>
   <div><a href="example.net">example.net</a></div>
   <div><a href="example.net/something">example.net/something</a></div>
   <div><a href="example.net/something#anchor">example.net/something#anchor</a></div>

From 59fcf3f5b342bd9b5d08967b06ffad0cb6e346b4 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Mon, 20 Dec 2021 15:20:56 -0500
Subject: [PATCH 34/87] Revert "EPAD8-1512 do not rename the ckeditor box
 plugin"

This reverts commit b6ec50341b01b29d4b6c6e9d401efcd5ea07528f.
---
 .../modules/custom/epa_wysiwyg/js/plugins/epaBox/plugin.js    | 4 ++--
 .../custom/epa_wysiwyg/src/Plugin/CKEditorPlugin/EPABox.php   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/drupal/web/modules/custom/epa_wysiwyg/js/plugins/epaBox/plugin.js b/services/drupal/web/modules/custom/epa_wysiwyg/js/plugins/epaBox/plugin.js
index 6960a13b7a..b96446a93d 100644
--- a/services/drupal/web/modules/custom/epa_wysiwyg/js/plugins/epaBox/plugin.js
+++ b/services/drupal/web/modules/custom/epa_wysiwyg/js/plugins/epaBox/plugin.js
@@ -23,14 +23,14 @@
       editor.addCommand('epaBoxCommand', new CKEDITOR.dialogCommand('epaBoxDialog'));
 
       editor.ui.addButton('epaBoxButton', {
-        label: 'Related Info Box',
+        label: 'Related Info Summary Box',
         command: 'epaBoxCommand',
         icon: iconPath
       });
 
       CKEDITOR.dialog.add('epaBoxDialog', function(editor) {
         return {
-          title: 'EPA Box',
+          title: 'Related Info Summary Box',
           minWidth: 400,
           minHeight: 200,
           contents: [{
diff --git a/services/drupal/web/modules/custom/epa_wysiwyg/src/Plugin/CKEditorPlugin/EPABox.php b/services/drupal/web/modules/custom/epa_wysiwyg/src/Plugin/CKEditorPlugin/EPABox.php
index bdeb44a6a7..14dd26bc46 100644
--- a/services/drupal/web/modules/custom/epa_wysiwyg/src/Plugin/CKEditorPlugin/EPABox.php
+++ b/services/drupal/web/modules/custom/epa_wysiwyg/src/Plugin/CKEditorPlugin/EPABox.php
@@ -14,7 +14,7 @@
  *
  * @CKEditorPlugin(
  *   id = "epaBox",
- *   label = @Translation("Related Info Box")
+ *   label = @Translation("Related Info Summary Box")
  * )
  */
 class EPABox extends CKEditorPluginBase {

From 624e9eb75d82296dd2f6213f9a85043f1285c7d4 Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Mon, 20 Dec 2021 13:39:39 -0800
Subject: [PATCH 35/87] [EPAD8-1559] Finish presave

---
 .../modules/custom/epa_workflow/epa_workflow.module    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
index 015dad7aad..930e105c19 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
@@ -17,6 +17,8 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\node\NodeInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Url;
+use Drupal\paragraphs\Entity\Paragraph;
+
 
 /**
  * Implements hook_entity_base_field_info().
@@ -622,11 +624,15 @@ function epa_workflow_module_implements_alter(&$implementations, $hook) {
  */
 function epa_workflow_entity_presave(EntityInterface $entity) {
   if ($entity->bundle() == 'perspective') {
-    $author_paragraphs = $entity->field_author_as_para->getValue();
+    $author_paragraphs = $entity->field_authors->getValue();
     $tids = [];
     foreach ($author_paragraphs as $author) {
-      array_push($tids, $author['subform']['field_a'][0]['target_id']);
+      $target_id = $author['target_id'];
+      $paragraph = Paragraph::load($target_id);
+      $author_tid = $paragraph->field_author->target_id;
+      array_push($tids, $author_tid);
     }
+    $entity->field_author_names = [];
     foreach ($tids as $tid) {
       $entity->field_author_names[] = [
         'target_id' => $tid

From c82dad627b877f285145d268f2eb387660c3b9a5 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Mon, 20 Dec 2021 17:05:36 -0500
Subject: [PATCH 36/87] EPAD8-1550 update drupal core (and associated packages)
 to 9.2.10 in order to get symfony/serializer update

---
 services/drupal/composer.json |   4 +-
 services/drupal/composer.lock | 397 ++++++++++++++++++++--------------
 2 files changed, 238 insertions(+), 163 deletions(-)

diff --git a/services/drupal/composer.json b/services/drupal/composer.json
index 866f041938..5b3fb58737 100644
--- a/services/drupal/composer.json
+++ b/services/drupal/composer.json
@@ -211,7 +211,7 @@
         "drupal/config_split": "~1.5",
         "drupal/content_moderation_notifications": "dev-3.x#7ffa936",
         "drupal/content_moderation_revert": "1.x-dev",
-        "drupal/core-composer-scaffold": "~9.1.0",
+        "drupal/core-composer-scaffold": "~9.2.0",
         "drupal/core-recommended": "~9.2.0",
         "drupal/cshs": "^3.5",
         "drupal/csv_serialization": "^1.5",
@@ -314,7 +314,7 @@
         "zaporylie/composer-drupal-optimizations": "^1.0"
     },
     "require-dev": {
-        "drupal/core-dev": "~9.1.0"
+        "drupal/core-dev": "~9.2.0"
     },
     "conflict": {
         "drupal/drupal": "*"
diff --git a/services/drupal/composer.lock b/services/drupal/composer.lock
index 792c679e93..351cb6d07a 100644
--- a/services/drupal/composer.lock
+++ b/services/drupal/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a786e7265e87e984e84dee3f8cba24a2",
+    "content-hash": "e90e0bd14cd6e73cd50b6e460238b9fe",
     "packages": [
         {
             "name": "akamai-open/edgegrid-auth",
@@ -3375,16 +3375,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "9.2.9",
+            "version": "9.2.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "2e2f015e881abccc32efcd264128e8a8444b2ec1"
+                "reference": "61248f85f78c02e7e0afde2b8a5113d3914bb50f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/2e2f015e881abccc32efcd264128e8a8444b2ec1",
-                "reference": "2e2f015e881abccc32efcd264128e8a8444b2ec1",
+                "url": "https://api.github.com/repos/drupal/core/zipball/61248f85f78c02e7e0afde2b8a5113d3914bb50f",
+                "reference": "61248f85f78c02e7e0afde2b8a5113d3914bb50f",
                 "shasum": ""
             },
             "require": {
@@ -3623,22 +3623,22 @@
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
             "support": {
-                "source": "https://github.com/drupal/core/tree/9.2.9"
+                "source": "https://github.com/drupal/core/tree/9.2.10"
             },
-            "time": "2021-11-17T21:05:58+00:00"
+            "time": "2021-11-24T14:27:27+00:00"
         },
         {
             "name": "drupal/core-composer-scaffold",
-            "version": "9.1.14",
+            "version": "9.2.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-composer-scaffold.git",
-                "reference": "7b125516d6568b888945ee03ac2636dcced76e8d"
+                "reference": "3c9efe8e154acc2cadb86b51733be55556677b0b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/7b125516d6568b888945ee03ac2636dcced76e8d",
-                "reference": "7b125516d6568b888945ee03ac2636dcced76e8d",
+                "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/3c9efe8e154acc2cadb86b51733be55556677b0b",
+                "reference": "3c9efe8e154acc2cadb86b51733be55556677b0b",
                 "shasum": ""
             },
             "require": {
@@ -3673,22 +3673,22 @@
                 "drupal"
             ],
             "support": {
-                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.2.1"
+                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.2.10"
             },
-            "time": "2020-08-07T22:30:13+00:00"
+            "time": "2021-08-24T12:04:07+00:00"
         },
         {
             "name": "drupal/core-recommended",
-            "version": "9.2.9",
+            "version": "9.2.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-recommended.git",
-                "reference": "a052e6f47864bb6597e6f449b9cfdb1aa4eea400"
+                "reference": "9beef737bbfd1db4f84ab3c19e5e7ae0b534383b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/a052e6f47864bb6597e6f449b9cfdb1aa4eea400",
-                "reference": "a052e6f47864bb6597e6f449b9cfdb1aa4eea400",
+                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/9beef737bbfd1db4f84ab3c19e5e7ae0b534383b",
+                "reference": "9beef737bbfd1db4f84ab3c19e5e7ae0b534383b",
                 "shasum": ""
             },
             "require": {
@@ -3697,7 +3697,7 @@
                 "doctrine/annotations": "1.13.1",
                 "doctrine/lexer": "1.2.1",
                 "doctrine/reflection": "1.2.2",
-                "drupal/core": "9.2.9",
+                "drupal/core": "9.2.10",
                 "egulias/email-validator": "2.1.25",
                 "guzzlehttp/guzzle": "6.5.5",
                 "guzzlehttp/promises": "1.4.1",
@@ -3740,7 +3740,7 @@
                 "symfony/process": "v4.4.25",
                 "symfony/psr-http-message-bridge": "v2.1.0",
                 "symfony/routing": "v4.4.25",
-                "symfony/serializer": "v4.4.25",
+                "symfony/serializer": "v4.4.35",
                 "symfony/service-contracts": "v2.4.0",
                 "symfony/translation": "v4.4.25",
                 "symfony/translation-contracts": "v2.4.0",
@@ -3760,9 +3760,9 @@
             ],
             "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-recommended/tree/9.2.9"
+                "source": "https://github.com/drupal/core-recommended/tree/9.2.10"
             },
-            "time": "2021-11-17T21:05:58+00:00"
+            "time": "2021-11-24T14:27:27+00:00"
         },
         {
             "name": "drupal/crop",
@@ -11404,16 +11404,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.13.1",
+            "version": "v4.13.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd"
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/63a79e8daa781cac14e5195e63ed8ae231dd10fd",
-                "reference": "63a79e8daa781cac14e5195e63ed8ae231dd10fd",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
                 "shasum": ""
             },
             "require": {
@@ -11454,9 +11454,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
             },
-            "time": "2021-11-03T20:52:16+00:00"
+            "time": "2021-11-30T19:35:32+00:00"
         },
         {
             "name": "nodespark/des-connector",
@@ -14538,21 +14538,22 @@
         },
         {
             "name": "symfony/serializer",
-            "version": "v4.4.25",
+            "version": "v4.4.35",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/serializer.git",
-                "reference": "6db3eb4f1bb437cd3730f52353ba4b568acaddf5"
+                "reference": "1b2ae02cb1b923987947e013688c51954a80b751"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/serializer/zipball/6db3eb4f1bb437cd3730f52353ba4b568acaddf5",
-                "reference": "6db3eb4f1bb437cd3730f52353ba4b568acaddf5",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/1b2ae02cb1b923987947e013688c51954a80b751",
+                "reference": "1b2ae02cb1b923987947e013688c51954a80b751",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.3",
-                "symfony/polyfill-ctype": "~1.8"
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
                 "phpdocumentor/reflection-docblock": "<3.0|>=3.2.0,<3.2.2",
@@ -14611,7 +14612,7 @@
             "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/serializer/tree/v4.4.25"
+                "source": "https://github.com/symfony/serializer/tree/v4.4.35"
             },
             "funding": [
                 {
@@ -14627,7 +14628,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T11:20:16+00:00"
+            "time": "2021-11-24T08:12:42+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -15616,69 +15617,6 @@
             },
             "time": "2021-10-11T11:58:47+00:00"
         },
-        {
-            "name": "behat/mink-browserkit-driver",
-            "version": "v1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/minkphp/MinkBrowserKitDriver.git",
-                "reference": "0ed1919eb09968f2e152ed91aee35300e70602a8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/0ed1919eb09968f2e152ed91aee35300e70602a8",
-                "reference": "0ed1919eb09968f2e152ed91aee35300e70602a8",
-                "shasum": ""
-            },
-            "require": {
-                "behat/mink": "^1.7.1@dev",
-                "php": ">=5.4",
-                "symfony/browser-kit": "~2.3|~3.0|~4.0",
-                "symfony/dom-crawler": "~2.3|~3.0|~4.0"
-            },
-            "require-dev": {
-                "mink/driver-testsuite": "dev-master",
-                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.18 || ^8.5 || ^9.5",
-                "symfony/debug": "^2.7|^3.0|^4.0",
-                "symfony/http-kernel": "~2.3|~3.0|~4.0",
-                "yoast/phpunit-polyfills": "^1.0"
-            },
-            "type": "mink-driver",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Behat\\Mink\\Driver\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Symfony2 BrowserKit driver for Mink framework",
-            "homepage": "https://mink.behat.org/",
-            "keywords": [
-                "Mink",
-                "Symfony2",
-                "browser",
-                "testing"
-            ],
-            "support": {
-                "issues": "https://github.com/minkphp/MinkBrowserKitDriver/issues",
-                "source": "https://github.com/minkphp/MinkBrowserKitDriver/tree/v1.4.0"
-            },
-            "time": "2021-10-12T09:42:37+00:00"
-        },
         {
             "name": "behat/mink-goutte-driver",
             "version": "v1.3.0",
@@ -15880,16 +15818,16 @@
         },
         {
             "name": "composer/composer",
-            "version": "2.1.12",
+            "version": "2.1.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "6e3c2b122e0ec41a7e885fcaf19fa15e2e0819a0"
+                "reference": "cd28fc05b0c9d3beaf58b57018725c4dc15a6446"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/6e3c2b122e0ec41a7e885fcaf19fa15e2e0819a0",
-                "reference": "6e3c2b122e0ec41a7e885fcaf19fa15e2e0819a0",
+                "url": "https://api.github.com/repos/composer/composer/zipball/cd28fc05b0c9d3beaf58b57018725c4dc15a6446",
+                "reference": "cd28fc05b0c9d3beaf58b57018725c4dc15a6446",
                 "shasum": ""
             },
             "require": {
@@ -15904,7 +15842,7 @@
                 "react/promise": "^1.2 || ^2.7",
                 "seld/jsonlint": "^1.4",
                 "seld/phar-utils": "^1.0",
-                "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
+                "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
                 "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
                 "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
                 "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0"
@@ -15958,7 +15896,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/composer/issues",
-                "source": "https://github.com/composer/composer/tree/2.1.12"
+                "source": "https://github.com/composer/composer/tree/2.1.14"
             },
             "funding": [
                 {
@@ -15974,7 +15912,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-09T15:02:04+00:00"
+            "time": "2021-11-30T09:51:43+00:00"
         },
         {
             "name": "composer/metadata-minifier",
@@ -16045,6 +15983,77 @@
             ],
             "time": "2021-04-07T13:37:33+00:00"
         },
+        {
+            "name": "composer/pcre",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/pcre.git",
+                "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2",
+                "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "symfony/phpunit-bridge": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Pcre\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
+            "keywords": [
+                "PCRE",
+                "preg",
+                "regex",
+                "regular expression"
+            ],
+            "support": {
+                "issues": "https://github.com/composer/pcre/issues",
+                "source": "https://github.com/composer/pcre/tree/1.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-12-06T15:17:27+00:00"
+        },
         {
             "name": "composer/spdx-licenses",
             "version": "1.5.6",
@@ -16127,25 +16136,27 @@
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339"
+                "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/84674dd3a7575ba617f5a76d7e9e29a7d3891339",
-                "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6555461e76962fd0379c444c46fd558a0fcfb65e",
+                "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e",
                 "shasum": ""
             },
             "require": {
+                "composer/pcre": "^1",
                 "php": "^5.3.2 || ^7.0 || ^8.0",
                 "psr/log": "^1 || ^2 || ^3"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.55",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0"
             },
             "type": "library",
             "autoload": {
@@ -16171,7 +16182,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/2.0.2"
+                "source": "https://github.com/composer/xdebug-handler/tree/2.0.3"
             },
             "funding": [
                 {
@@ -16187,7 +16198,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-31T17:03:58+00:00"
+            "time": "2021-12-08T13:07:32+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -16303,16 +16314,16 @@
         },
         {
             "name": "drupal/core-dev",
-            "version": "9.1.14",
+            "version": "9.2.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-dev.git",
-                "reference": "559e6611014b0815c61b8004598854617d541d97"
+                "reference": "4b5b8556711315e180d72830733ddb07a57a2d73"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-dev/zipball/559e6611014b0815c61b8004598854617d541d97",
-                "reference": "559e6611014b0815c61b8004598854617d541d97",
+                "url": "https://api.github.com/repos/drupal/core-dev/zipball/4b5b8556711315e180d72830733ddb07a57a2d73",
+                "reference": "4b5b8556711315e180d72830733ddb07a57a2d73",
                 "shasum": ""
             },
             "require": {
@@ -16320,12 +16331,15 @@
                 "behat/mink-goutte-driver": "^1.2",
                 "behat/mink-selenium2-driver": "^1.4",
                 "composer/composer": "^2.0.2",
-                "drupal/coder": "^8.3.7",
+                "drupal/coder": "^8.3.10",
                 "easyrdf/easyrdf": "^0.9 || ^1.0",
+                "fabpot/goutte": "^3.3",
+                "friends-of-behat/mink-browserkit-driver": "^1.4",
+                "instaclick/php-webdriver": "^1.4.1",
                 "justinrainbow/json-schema": "^5.2",
                 "mikey179/vfsstream": "^1.6.8",
-                "phpspec/prophecy": "^1.7",
-                "phpunit/phpunit": "^8.4.1 || ^9",
+                "phpspec/prophecy": "^1.12",
+                "phpunit/phpunit": "^8.5.14 || ^9",
                 "symfony/browser-kit": "^4.4",
                 "symfony/css-selector": "^4.4",
                 "symfony/dom-crawler": "^4.4 !=4.4.5",
@@ -16333,8 +16347,8 @@
                 "symfony/filesystem": "^4.4",
                 "symfony/finder": "^4.4",
                 "symfony/lock": "^4.4",
-                "symfony/phpunit-bridge": "^5.1.4",
-                "symfony/var-dumper": "^5.1.2"
+                "symfony/phpunit-bridge": "^5.3.0",
+                "symfony/var-dumper": "^5.3.0"
             },
             "conflict": {
                 "webflo/drupal-core-require-dev": "*"
@@ -16346,9 +16360,9 @@
             ],
             "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-dev/tree/9.1.14"
+                "source": "https://github.com/drupal/core-dev/tree/9.2.10"
             },
-            "time": "2020-10-28T08:13:15+00:00"
+            "time": "2021-06-01T16:41:50+00:00"
         },
         {
             "name": "easyrdf/easyrdf",
@@ -16484,6 +16498,68 @@
             },
             "time": "2020-11-01T09:30:18+00:00"
         },
+        {
+            "name": "friends-of-behat/mink-browserkit-driver",
+            "version": "v1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/FriendsOfBehat/MinkBrowserKitDriver.git",
+                "reference": "b3c29f18fe20487846e4c2733b066ec5e47f4f76"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/FriendsOfBehat/MinkBrowserKitDriver/zipball/b3c29f18fe20487846e4c2733b066ec5e47f4f76",
+                "reference": "b3c29f18fe20487846e4c2733b066ec5e47f4f76",
+                "shasum": ""
+            },
+            "require": {
+                "behat/mink": "^1.7",
+                "php": "^7.4|^8.0",
+                "symfony/browser-kit": "^4.4|^5.0|^6.0",
+                "symfony/dom-crawler": "^4.4|^5.0|^6.0"
+            },
+            "replace": {
+                "behat/mink-browserkit-driver": "self.version"
+            },
+            "require-dev": {
+                "friends-of-behat/mink-driver-testsuite": "dev-master",
+                "symfony/http-kernel": "^4.4|^5.0|^6.0"
+            },
+            "type": "mink-driver",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Behat\\Mink\\Driver\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Symfony2 BrowserKit driver for Mink framework",
+            "homepage": "http://mink.behat.org/",
+            "keywords": [
+                "Mink",
+                "Symfony2",
+                "browser",
+                "testing"
+            ],
+            "support": {
+                "source": "https://github.com/FriendsOfBehat/MinkBrowserKitDriver/tree/v1.6.1"
+            },
+            "time": "2021-12-13T10:41:57+00:00"
+        },
         {
             "name": "instaclick/php-webdriver",
             "version": "1.4.10",
@@ -16999,16 +17075,16 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.14.0",
+            "version": "v1.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e"
+                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
-                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
+                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
                 "shasum": ""
             },
             "require": {
@@ -17060,22 +17136,22 @@
             ],
             "support": {
                 "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/1.14.0"
+                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
             },
-            "time": "2021-09-10T09:02:12+00:00"
+            "time": "2021-12-08T12:19:24+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.9",
+            "version": "9.2.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "f301eb1453c9e7a1bc912ee8b0ea9db22c60223b"
+                "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f301eb1453c9e7a1bc912ee8b0ea9db22c60223b",
-                "reference": "f301eb1453c9e7a1bc912ee8b0ea9db22c60223b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d5850aaf931743067f4bfc1ae4cbd06468400687",
+                "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687",
                 "shasum": ""
             },
             "require": {
@@ -17131,7 +17207,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.9"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.10"
             },
             "funding": [
                 {
@@ -17139,20 +17215,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-11-19T15:21:02+00:00"
+            "time": "2021-12-05T09:12:13+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "3.0.5",
+            "version": "3.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8"
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
                 "shasum": ""
             },
             "require": {
@@ -17191,7 +17267,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
             },
             "funding": [
                 {
@@ -17199,7 +17275,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:57:25+00:00"
+            "time": "2021-12-02T12:48:52+00:00"
         },
         {
             "name": "phpunit/php-invoker",
@@ -18338,7 +18414,6 @@
                     "type": "github"
                 }
             ],
-            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {
@@ -18515,16 +18590,16 @@
         },
         {
             "name": "seld/phar-utils",
-            "version": "1.1.2",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/phar-utils.git",
-                "reference": "749042a2315705d2dfbbc59234dd9ceb22bf3ff0"
+                "reference": "9f3452c93ff423469c0d56450431562ca423dcee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/749042a2315705d2dfbbc59234dd9ceb22bf3ff0",
-                "reference": "749042a2315705d2dfbbc59234dd9ceb22bf3ff0",
+                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/9f3452c93ff423469c0d56450431562ca423dcee",
+                "reference": "9f3452c93ff423469c0d56450431562ca423dcee",
                 "shasum": ""
             },
             "require": {
@@ -18557,9 +18632,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/phar-utils/issues",
-                "source": "https://github.com/Seldaek/phar-utils/tree/1.1.2"
+                "source": "https://github.com/Seldaek/phar-utils/tree/1.2.0"
             },
-            "time": "2021-08-19T21:01:38+00:00"
+            "time": "2021-12-10T11:20:11+00:00"
         },
         {
             "name": "sirbrillig/phpcs-variable-analysis",
@@ -18616,16 +18691,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.6.1",
+            "version": "3.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e"
+                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f268ca40d54617c6e06757f83f699775c9b3ff2e",
-                "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a",
+                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a",
                 "shasum": ""
             },
             "require": {
@@ -18668,7 +18743,7 @@
                 "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                 "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
             },
-            "time": "2021-10-11T04:00:11+00:00"
+            "time": "2021-12-12T21:44:58+00:00"
         },
         {
             "name": "symfony/browser-kit",
@@ -18962,27 +19037,27 @@
         },
         {
             "name": "symfony/phpunit-bridge",
-            "version": "v5.3.11",
+            "version": "v5.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/phpunit-bridge.git",
-                "reference": "7b3637f0ce55c510a0fbe6e4d49b223103b7bf7b"
+                "reference": "59bbd98ee7aa15b9f75c0fc088c7a5cbf7aa9b5c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/7b3637f0ce55c510a0fbe6e4d49b223103b7bf7b",
-                "reference": "7b3637f0ce55c510a0fbe6e4d49b223103b7bf7b",
+                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/59bbd98ee7aa15b9f75c0fc088c7a5cbf7aa9b5c",
+                "reference": "59bbd98ee7aa15b9f75c0fc088c7a5cbf7aa9b5c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.3",
-                "symfony/deprecation-contracts": "^2.1"
+                "symfony/deprecation-contracts": "^2.1|^3"
             },
             "conflict": {
                 "phpunit/phpunit": "<7.5|9.1.2"
             },
             "require-dev": {
-                "symfony/error-handler": "^4.4|^5.0"
+                "symfony/error-handler": "^4.4|^5.0|^6.0"
             },
             "suggest": {
                 "symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
@@ -19025,7 +19100,7 @@
             "description": "Provides utilities for PHPUnit, especially user deprecation notices management",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/phpunit-bridge/tree/v5.3.11"
+                "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.0"
             },
             "funding": [
                 {
@@ -19041,7 +19116,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-12T11:38:27+00:00"
+            "time": "2021-11-29T15:30:56+00:00"
         },
         {
             "name": "theseer/tokenizer",

From d66d053f88299f78f03563911a5069c25c96a360 Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Mon, 20 Dec 2021 23:59:37 -0800
Subject: [PATCH 37/87] [EPAD8-1559] Initial deploy

---
 .../epa_workflow/epa_workflow.deploy.php      | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.deploy.php b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.deploy.php
index b6ccb960b7..be486cdfe2 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.deploy.php
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.deploy.php
@@ -215,3 +215,72 @@ function epa_workflow_deploy_0004_fix_nodes_missing_transition_date(&$sandbox) {
     $sandbox['#finished'] = ($sandbox['current'] / $sandbox['total']);
   }
 }
+
+/**
+ * For all existing Perspective, if values exist in field_authors,
+ * populate the new taxonomy reference field, field_author_names, with the
+ * names of the authors. This elimiates duplicate entities in the dynamic lists.
+ */
+function epa_workflow_deploy_0028_populate_perspective_author_names_field(&$sandbox) {
+  if (!isset($sandbox['total'])) {
+    // Query all published perspectives.
+    $result = \Drupal::entityQuery('node')
+      ->condition('type', 'perspective')
+      ->execute();
+
+    $sandbox['total'] = count($result);
+    $sandbox['current'] = 0;
+
+    \Drupal::logger('epa_workflow')->notice($sandbox['total'] . ' perspectives.');
+  }
+
+  $batch_size = 25;
+
+  // sort nid asc
+  // keep track of highest nid
+  // increment high water mark
+  // can save these values in $sandbox
+
+  // test pub persp that has author but not in new author field
+  // make sure after this, it has a new value and is still pub
+  $nids = \Drupal::entityQuery('node')
+    ->condition('type', 'perspective')
+    ->range(0, $batch_size)
+    ->execute();
+
+  if (empty($nids)) {
+    $sandbox['#finished'] = 1;
+    return;
+  }
+
+  /** @var \Drupal\node\NodeInterface[] $nodes */
+  $nodes = \Drupal::entityTypeManager()
+    ->getStorage('node')
+    ->loadMultiple($nids);
+
+  foreach ($nodes as $node) {
+    \Drupal::logger('epa_workflow')->notice($node->title->value);
+    if (!$node->field_authors->isEmpty()) {
+      $author_paragraphs = $node->field_authors->getValue();
+      $tids = [];
+      foreach ($author_paragraphs as $author) {
+        $target_id = $author['target_id'];
+        $paragraph = Drupal\paragraphs\Entity\Paragraph::load($target_id);
+        $author_tid = $paragraph->field_author->target_id;
+        array_push($tids, $author_tid);
+      }
+      $node->field_author_names = [];
+      foreach ($tids as $tid) {
+        $node->field_author_names[] = [
+          'target_id' => $tid
+        ];
+      }
+    }
+    else {
+      // Clear new field value if field_authors is empty.
+      $node->field_author_names = [];
+    }
+    $node->save();
+    $sandbox['current']++;
+  }
+}

From 2dc899e17dc979726722161aca57e40393c36235 Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Tue, 21 Dec 2021 00:00:32 -0800
Subject: [PATCH 38/87] [EPAD8-1559] Update deploy number and add presave to
 existing nnode_presave

---
 .../epa_workflow/epa_workflow.deploy.php      |  2 +-
 .../custom/epa_workflow/epa_workflow.module   | 46 ++++++++++---------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.deploy.php b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.deploy.php
index be486cdfe2..75cde22028 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.deploy.php
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.deploy.php
@@ -221,7 +221,7 @@ function epa_workflow_deploy_0004_fix_nodes_missing_transition_date(&$sandbox) {
  * populate the new taxonomy reference field, field_author_names, with the
  * names of the authors. This elimiates duplicate entities in the dynamic lists.
  */
-function epa_workflow_deploy_0028_populate_perspective_author_names_field(&$sandbox) {
+function epa_workflow_deploy_0005_populate_perspective_author_names_field(&$sandbox) {
   if (!isset($sandbox['total'])) {
     // Query all published perspectives.
     $result = \Drupal::entityQuery('node')
diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
index 930e105c19..bdae87fae3 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
@@ -451,6 +451,30 @@ function epa_workflow_node_presave(NodeInterface $node) {
       '%state' => $new_state,
     ]));
   }
+
+  // Update field_author_names with values from field_authors.
+  if ($node->bundle() == 'perspective') {
+    if (!$node->field_authors->isEmpty()) {
+      $author_paragraphs = $node->field_authors->getValue();
+      $tids = [];
+      foreach ($author_paragraphs as $author) {
+        $target_id = $author['target_id'];
+        $paragraph = Paragraph::load($target_id);
+        $author_tid = $paragraph->field_author->target_id;
+        array_push($tids, $author_tid);
+      }
+      $node->field_author_names = [];
+      foreach ($tids as $tid) {
+        $node->field_author_names[] = [
+          'target_id' => $tid
+        ];
+      }
+    }
+    else {
+      // Clear new field value if field_authors is empty.
+      $node->field_author_names = [];
+    }
+  }
 }
 
 /**
@@ -618,25 +642,3 @@ function epa_workflow_module_implements_alter(&$implementations, $hook) {
     unset($implementations['scheduled_publish']);
   }
 }
-
-/**
- * Implements hook_entity_presave().
- */
-function epa_workflow_entity_presave(EntityInterface $entity) {
-  if ($entity->bundle() == 'perspective') {
-    $author_paragraphs = $entity->field_authors->getValue();
-    $tids = [];
-    foreach ($author_paragraphs as $author) {
-      $target_id = $author['target_id'];
-      $paragraph = Paragraph::load($target_id);
-      $author_tid = $paragraph->field_author->target_id;
-      array_push($tids, $author_tid);
-    }
-    $entity->field_author_names = [];
-    foreach ($tids as $tid) {
-      $entity->field_author_names[] = [
-        'target_id' => $tid
-      ];
-    }
-  }
-}

From 24a94141a9f428666b76076b14e4bfdcb367ba70 Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Tue, 21 Dec 2021 00:01:09 -0800
Subject: [PATCH 39/87] [EPAD8-1559] Update view, remve relationships and
 update author exposed filter

---
 .../views.view.dynamic_list_perspectives.yml  | 68 ++++++-------------
 1 file changed, 22 insertions(+), 46 deletions(-)

diff --git a/services/drupal/config/sync/views.view.dynamic_list_perspectives.yml b/services/drupal/config/sync/views.view.dynamic_list_perspectives.yml
index c7abf4a722..6b0e716466 100644
--- a/services/drupal/config/sync/views.view.dynamic_list_perspectives.yml
+++ b/services/drupal/config/sync/views.view.dynamic_list_perspectives.yml
@@ -5,16 +5,15 @@ dependencies:
   config:
     - core.entity_view_mode.node.link
     - node.type.perspective
+    - taxonomy.vocabulary.author
     - taxonomy.vocabulary.press_office
     - taxonomy.vocabulary.subject
   module:
     - datetime
     - epa_core
     - node
-    - paragraphs
     - taxonomy
     - user
-    - views_autocomplete_filters
 id: dynamic_list_perspectives
 label: 'Dynamic List: Perspectives'
 module: views
@@ -130,29 +129,27 @@ display:
             operator_limit_selection: false
             operator_list: {  }
           group: 1
-        name:
-          id: name
-          table: taxonomy_term_field_data
-          field: name
-          relationship: field_author
+        field_author_names_target_id:
+          id: field_author_names_target_id
+          table: node__field_author_names
+          field: field_author_names_target_id
+          relationship: none
           group_type: group
           admin_label: ''
-          operator: contains
-          value: ''
+          operator: or
+          value: {  }
           group: 1
           exposed: true
           expose:
-            operator_id: name_op
+            operator_id: field_author_names_target_id_op
             label: Name
             description: ''
-            use_operator: true
-            operator: name_op
+            use_operator: false
+            operator: field_author_names_target_id_op
             operator_limit_selection: true
             operator_list:
-              '=': '='
-              contains: contains
-              starts: starts
-            identifier: name
+              or: or
+            identifier: field_author_names_target_id
             required: false
             remember: false
             multiple: false
@@ -166,14 +163,7 @@ display:
               system_webmaster: '0'
               menu_admin: '0'
               administrator: '0'
-            placeholder: ''
-            autocomplete_filter: 0
-            autocomplete_min_chars: '0'
-            autocomplete_items: '10'
-            autocomplete_field: ''
-            autocomplete_raw_suggestion: 1
-            autocomplete_raw_dropdown: 1
-            autocomplete_dependent: 0
+            reduce: false
           is_grouped: false
           group_info:
             label: ''
@@ -186,9 +176,13 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: taxonomy_term
-          entity_field: name
-          plugin_id: views_autocomplete_filters_string
+          reduce_duplicates: false
+          type: textfield
+          limit: true
+          vid: author
+          hierarchy: false
+          error_message: true
+          plugin_id: taxonomy_index_tid
         field_release_value:
           id: field_release_value
           table: node__field_release
@@ -415,25 +409,7 @@ display:
       header: {  }
       footer: {  }
       empty: {  }
-      relationships:
-        field_authors:
-          id: field_authors
-          table: node__field_authors
-          field: field_authors
-          relationship: none
-          group_type: group
-          admin_label: 'field_authors: Paragraph'
-          required: false
-          plugin_id: standard
-        field_author:
-          id: field_author
-          table: paragraph__field_author
-          field: field_author
-          relationship: field_authors
-          group_type: group
-          admin_label: 'field_author: Taxonomy term'
-          required: false
-          plugin_id: standard
+      relationships: {  }
       arguments: {  }
       display_extenders:
         views_ajax_get:

From d16677386498236cceb201fba6d8a8427311ef64 Mon Sep 17 00:00:00 2001
From: Carson Oldson <coldson@forumone.com>
Date: Tue, 21 Dec 2021 09:46:15 -0600
Subject: [PATCH 40/87] [EPAD8-1553] Adjusting dynamic lists perspectives view
 to use 'Perspectives Subjects' vocab rather than just 'Subjects'.

---
 .../config/sync/views.view.dynamic_list_perspectives.yml      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/drupal/config/sync/views.view.dynamic_list_perspectives.yml b/services/drupal/config/sync/views.view.dynamic_list_perspectives.yml
index c7abf4a722..50ac3ab421 100644
--- a/services/drupal/config/sync/views.view.dynamic_list_perspectives.yml
+++ b/services/drupal/config/sync/views.view.dynamic_list_perspectives.yml
@@ -5,8 +5,8 @@ dependencies:
   config:
     - core.entity_view_mode.node.link
     - node.type.perspective
+    - taxonomy.vocabulary.perspectives_subjects
     - taxonomy.vocabulary.press_office
-    - taxonomy.vocabulary.subject
   module:
     - datetime
     - epa_core
@@ -341,7 +341,7 @@ display:
           reduce_duplicates: false
           type: select
           limit: true
-          vid: subject
+          vid: perspectives_subjects
           hierarchy: false
           error_message: true
           plugin_id: taxonomy_index_tid

From 98e222563c9703f9a29d6504550162db5cb6edfb Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Tue, 21 Dec 2021 13:16:52 -0500
Subject: [PATCH 41/87] [EPAD8-1563] override focus styles on usa-button

---
 .../epa_theme/source/_patterns/03-uswds/button/_button.scss  | 5 +++++
 .../button/button--accent-cool/_button--accent-cool.scss     | 5 +++++
 .../03-uswds/button/button--inverse/_button--inverse.scss    | 5 +++++
 .../03-uswds/button/button--outline/_button--outline.scss    | 5 +++++
 .../03-uswds/button/button--unstyled/_button--unstyled.scss  | 5 +++++
 5 files changed, 25 insertions(+)
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/_button.scss
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/button--accent-cool/_button--accent-cool.scss
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/button--inverse/_button--inverse.scss
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/button--outline/_button--outline.scss
 create mode 100644 services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/button--unstyled/_button--unstyled.scss

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/_button.scss b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/_button.scss
new file mode 100644
index 0000000000..b59fb40ba8
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/_button.scss
@@ -0,0 +1,5 @@
+.usa-button {
+  &:focus {
+    color: gesso-grayscale(white);
+  }
+}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/button--accent-cool/_button--accent-cool.scss b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/button--accent-cool/_button--accent-cool.scss
new file mode 100644
index 0000000000..4f81c00b58
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/button--accent-cool/_button--accent-cool.scss
@@ -0,0 +1,5 @@
+.usa-button--accent-cool {
+  &:focus {
+    color: color(gray-90);
+  }
+}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/button--inverse/_button--inverse.scss b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/button--inverse/_button--inverse.scss
new file mode 100644
index 0000000000..4cf951c35e
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/button--inverse/_button--inverse.scss
@@ -0,0 +1,5 @@
+.usa-button--inverse.usa-button--outline {
+  &:focus {
+    color: color(gray-cool-5);
+  }
+}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/button--outline/_button--outline.scss b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/button--outline/_button--outline.scss
new file mode 100644
index 0000000000..c7f8522219
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/button--outline/_button--outline.scss
@@ -0,0 +1,5 @@
+.usa-button--outline {
+  &:focus {
+    color: color(blue-warm-80v);
+  }
+}
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/button--unstyled/_button--unstyled.scss b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/button--unstyled/_button--unstyled.scss
new file mode 100644
index 0000000000..5056fa4aaa
--- /dev/null
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/button/button--unstyled/_button--unstyled.scss
@@ -0,0 +1,5 @@
+.usa-button--unstyled {
+  &:focus {
+    color: color(blue-60v);
+  }
+}

From 5be9272d5e2f01c4e93ba451cc8889724d21f6ab Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Tue, 21 Dec 2021 14:53:14 -0500
Subject: [PATCH 42/87] EPAD8-1561 remove markup from title and release date on
 news release CSV export

---
 .../sync/views.view.news_release_export.yml   | 48 +++++++++++++------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/services/drupal/config/sync/views.view.news_release_export.yml b/services/drupal/config/sync/views.view.news_release_export.yml
index 4eba13b9c7..530fc5e918 100644
--- a/services/drupal/config/sync/views.view.news_release_export.yml
+++ b/services/drupal/config/sync/views.view.news_release_export.yml
@@ -87,27 +87,38 @@ display:
           id: title
           table: node_field_data
           field: title
-          entity_type: node
-          entity_field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Title
+          exclude: false
           alter:
             alter_text: false
+            text: ''
             make_link: false
+            path: ''
             absolute: false
-            trim: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
             word_boundary: false
             ellipsis: false
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
             strip_tags: false
+            trim: false
+            preserve_tags: ''
             html: false
-          hide_empty: false
-          empty_zero: false
-          settings:
-            link_to_entity: true
-          plugin_id: field
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Title
-          exclude: false
           element_type: ''
           element_class: ''
           element_label_type: ''
@@ -117,9 +128,13 @@ display:
           element_wrapper_class: ''
           element_default_classes: true
           empty: ''
+          hide_empty: false
+          empty_zero: false
           hide_alter_empty: true
           click_sort_column: value
           type: string
+          settings:
+            link_to_entity: false
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -130,6 +145,9 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+          entity_type: node
+          entity_field: title
+          plugin_id: field
         field_release:
           id: field_release
           table: node__field_release
@@ -162,7 +180,7 @@ display:
             more_link: false
             more_link_text: ''
             more_link_path: ''
-            strip_tags: false
+            strip_tags: true
             trim: false
             preserve_tags: ''
             html: false
@@ -173,7 +191,7 @@ display:
           element_label_colon: true
           element_wrapper_type: ''
           element_wrapper_class: ''
-          element_default_classes: true
+          element_default_classes: false
           empty: ''
           hide_empty: false
           empty_zero: false

From 8622d7ce247c475662358591688b39f797c8350c Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Sun, 26 Dec 2021 23:28:46 -0800
Subject: [PATCH 43/87] [EPAD8-1559] Change to static query

---
 .../epa_workflow/epa_workflow.deploy.php      | 43 +++++++++++--------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.deploy.php b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.deploy.php
index 75cde22028..8fdfdb763b 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.deploy.php
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.deploy.php
@@ -221,37 +221,42 @@ function epa_workflow_deploy_0004_fix_nodes_missing_transition_date(&$sandbox) {
  * populate the new taxonomy reference field, field_author_names, with the
  * names of the authors. This elimiates duplicate entities in the dynamic lists.
  */
-function epa_workflow_deploy_0005_populate_perspective_author_names_field(&$sandbox) {
+function epa_workflow_deploy_0006_populate_perspective_author_names_field(&$sandbox) {
   if (!isset($sandbox['total'])) {
-    // Query all published perspectives.
-    $result = \Drupal::entityQuery('node')
-      ->condition('type', 'perspective')
-      ->execute();
+    // Query all perspectives.
+    $result = \Drupal::database()->query(
+      "SELECT nid
+              FROM {node}
+              WHERE type = 'perspective'
+              ORDER BY nid DESC")
+      ->fetchCol('nid');
 
     $sandbox['total'] = count($result);
     $sandbox['current'] = 0;
+    $sandbox['highest_nid'] = reset($result);
+    $sandbox['high_water_mark'] = 0;
 
     \Drupal::logger('epa_workflow')->notice($sandbox['total'] . ' perspectives.');
   }
 
-  $batch_size = 25;
-
-  // sort nid asc
-  // keep track of highest nid
-  // increment high water mark
-  // can save these values in $sandbox
-
-  // test pub persp that has author but not in new author field
-  // make sure after this, it has a new value and is still pub
-  $nids = \Drupal::entityQuery('node')
-    ->condition('type', 'perspective')
-    ->range(0, $batch_size)
-    ->execute();
+  $nids = \Drupal::database()->query(
+    "SELECT nid 
+          FROM {node} 
+          WHERE type = 'perspective' AND nid > :high_water_mark AND nid <= :highest_nid
+          ORDER BY nid ASC
+          LIMIT 25;", [
+            ':high_water_mark' => $sandbox['high_water_mark'], 
+            ':highest_nid' => $sandbox['highest_nid']
+          ])
+    ->fetchCol('nid');
 
   if (empty($nids)) {
     $sandbox['#finished'] = 1;
     return;
   }
+  else {
+    $sandbox['#finished'] = 0;
+  }
 
   /** @var \Drupal\node\NodeInterface[] $nodes */
   $nodes = \Drupal::entityTypeManager()
@@ -259,7 +264,7 @@ function epa_workflow_deploy_0005_populate_perspective_author_names_field(&$sand
     ->loadMultiple($nids);
 
   foreach ($nodes as $node) {
-    \Drupal::logger('epa_workflow')->notice($node->title->value);
+    $sandbox['high_water_mark'] = $node->id();
     if (!$node->field_authors->isEmpty()) {
       $author_paragraphs = $node->field_authors->getValue();
       $tids = [];

From e9d627e720d82f21d9eb9bf18b610f43587b5eed Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Sun, 26 Dec 2021 23:56:39 -0800
Subject: [PATCH 44/87] [EPAD8-1559] Remove extra line

---
 .../drupal/web/modules/custom/epa_workflow/epa_workflow.module   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
index cd41712526..d23ef6b7db 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
@@ -19,7 +19,6 @@ use Drupal\Core\Link;
 use Drupal\Core\Url;
 use Drupal\paragraphs\Entity\Paragraph;
 
-
 /**
  * Implements hook_entity_base_field_info().
  */

From 37baf0c88817b269dc6c758765830c580176b4ba Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Mon, 27 Dec 2021 00:14:49 -0800
Subject: [PATCH 45/87] [EPAD8-1559] Hide field_author_names

---
 ...ity_form_display.node.perspective.default.yml | 11 +----------
 ...ity_view_display.node.perspective.default.yml | 16 ----------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/services/drupal/config/sync/core.entity_form_display.node.perspective.default.yml b/services/drupal/config/sync/core.entity_form_display.node.perspective.default.yml
index 54509732c1..b2386adc60 100644
--- a/services/drupal/config/sync/core.entity_form_display.node.perspective.default.yml
+++ b/services/drupal/config/sync/core.entity_form_display.node.perspective.default.yml
@@ -132,16 +132,6 @@ content:
       help_text: ''
       multiple: false
     third_party_settings: {  }
-  field_author_names:
-    type: entity_reference_autocomplete
-    weight: 17
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
   field_authors:
     type: paragraphs
     weight: 9
@@ -351,6 +341,7 @@ content:
     settings: {  }
     third_party_settings: {  }
 hidden:
+  field_author_names: true
   field_last_published: true
   field_review_deadline: true
   field_type: true
diff --git a/services/drupal/config/sync/core.entity_view_display.node.perspective.default.yml b/services/drupal/config/sync/core.entity_view_display.node.perspective.default.yml
index 1b584b014e..e92cd44091 100644
--- a/services/drupal/config/sync/core.entity_view_display.node.perspective.default.yml
+++ b/services/drupal/config/sync/core.entity_view_display.node.perspective.default.yml
@@ -185,22 +185,6 @@ third_party_settings:
                 type: entity_reference_label
             additional: {  }
             weight: 10
-          440c065c-cdf4-4864-bfdf-b8b1cfde144b:
-            uuid: 440c065c-cdf4-4864-bfdf-b8b1cfde144b
-            region: content
-            configuration:
-              label_display: '0'
-              context_mapping:
-                entity: layout_builder.entity
-              id: 'field_block:node:perspective:field_author_names'
-              formatter:
-                label: above
-                settings:
-                  link: true
-                third_party_settings: {  }
-                type: entity_reference_label
-            additional: {  }
-            weight: 11
         third_party_settings: {  }
   layout_builder_restrictions:
     allowed_block_categories: {  }

From c9d92418d0c6b2a00fd4d5c2b4c505bea37cdc28 Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Mon, 27 Dec 2021 00:46:11 -0800
Subject: [PATCH 46/87] [EPAD8-1530] Remove plain text and switch to filtered
 html

---
 ...field.field.node.public_notice.field_how_to_comment.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/services/drupal/config/sync/field.field.node.public_notice.field_how_to_comment.yml b/services/drupal/config/sync/field.field.node.public_notice.field_how_to_comment.yml
index 86ec8cb540..0950a2917c 100644
--- a/services/drupal/config/sync/field.field.node.public_notice.field_how_to_comment.yml
+++ b/services/drupal/config/sync/field.field.node.public_notice.field_how_to_comment.yml
@@ -13,9 +13,10 @@ third_party_settings:
   allowed_formats:
     filtered_html: filtered_html
     full_html: full_html
-    plain_text: plain_text
     inline: '0'
+    restricted_html: '0'
     unprocessed: '0'
+    plain_text: '0'
   custom_add_another:
     custom_add_another: ''
     custom_remove: ''
@@ -29,8 +30,8 @@ required: false
 translatable: false
 default_value:
   -
-    value: "You may comment on the proposed action in writing, using Email, Phone or mail. Submit comments to:\r\n\r\nEmail:\r\n\r\nPhone:\r\n\r\nMail:"
-    format: plain_text
+    value: "<p>You may comment on the proposed action in writing, using Email, Phone or mail. Submit comments to:</p>\r\n\r\n<p>Email:</p>\r\n\r\n<p>Phone:</p>\r\n\r\n<p>Mail:</p>\r\n"
+    format: filtered_html
 default_value_callback: ''
 settings: {  }
 field_type: text_long

From 08eb9ff95ae6717a0ce2c9d76b82870798dc1549 Mon Sep 17 00:00:00 2001
From: Carson Oldson <coldson@forumone.com>
Date: Mon, 27 Dec 2021 08:56:41 -0600
Subject: [PATCH 47/87] [EPAD8-1265] Setting default values for channel and
 type on regulation nodes.

---
 .../sync/field.field.node.regulation.field_channel.yml      | 6 +++++-
 .../config/sync/field.field.node.regulation.field_type.yml  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/services/drupal/config/sync/field.field.node.regulation.field_channel.yml b/services/drupal/config/sync/field.field.node.regulation.field_channel.yml
index b07854a396..b396b44512 100644
--- a/services/drupal/config/sync/field.field.node.regulation.field_channel.yml
+++ b/services/drupal/config/sync/field.field.node.regulation.field_channel.yml
@@ -6,6 +6,8 @@ dependencies:
     - field.storage.node.field_channel
     - node.type.regulation
     - taxonomy.vocabulary.channels
+  content:
+    - 'taxonomy_term:channels:5a512a6a-01eb-43b3-9cf6-824c87bafbce'
   module:
     - custom_add_another
 third_party_settings:
@@ -20,7 +22,9 @@ label: Channel
 description: 'Use <a href="https://www.epa.gov/webguide/metadata-web-area-homepages#channel" class="external" target="_blank">this guide</a> for choosing the right channel.'
 required: true
 translatable: false
-default_value: {  }
+default_value:
+  -
+    target_uuid: 5a512a6a-01eb-43b3-9cf6-824c87bafbce
 default_value_callback: ''
 settings:
   handler: 'default:taxonomy_term'
diff --git a/services/drupal/config/sync/field.field.node.regulation.field_type.yml b/services/drupal/config/sync/field.field.node.regulation.field_type.yml
index 6eb30187a9..66e2d1abfb 100644
--- a/services/drupal/config/sync/field.field.node.regulation.field_type.yml
+++ b/services/drupal/config/sync/field.field.node.regulation.field_type.yml
@@ -6,6 +6,8 @@ dependencies:
     - field.storage.node.field_type
     - node.type.regulation
     - taxonomy.vocabulary.type
+  content:
+    - 'taxonomy_term:type:8f6958bf-a20c-42fd-92dd-c7e70e255319'
   module:
     - custom_add_another
 third_party_settings:
@@ -20,7 +22,9 @@ label: Type
 description: 'Use <a href="https://www.epa.gov/webguide/metadata-basic-pages#type" class="external" target="_blank">this guide</a> for choosing the right type.'
 required: true
 translatable: false
-default_value: {  }
+default_value:
+  -
+    target_uuid: 8f6958bf-a20c-42fd-92dd-c7e70e255319
 default_value_callback: ''
 settings:
   handler: 'default:taxonomy_term'

From e94394c94c862fe0b8fcbcfa62a2edeca0bb29cf Mon Sep 17 00:00:00 2001
From: Carson Oldson <coldson@forumone.com>
Date: Thu, 30 Dec 2021 09:37:52 -0600
Subject: [PATCH 48/87] [EPAD8-1265] Using default_value_callback to set
 default value for regulatin field_type and field_channel.

---
 ...ld.field.node.regulation.field_channel.yml |  8 ++-----
 ...field.field.node.regulation.field_type.yml |  8 ++-----
 .../modules/custom/epa_core/epa_core.module   | 23 +++++++++++++++++++
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/services/drupal/config/sync/field.field.node.regulation.field_channel.yml b/services/drupal/config/sync/field.field.node.regulation.field_channel.yml
index b396b44512..6da10ed9a7 100644
--- a/services/drupal/config/sync/field.field.node.regulation.field_channel.yml
+++ b/services/drupal/config/sync/field.field.node.regulation.field_channel.yml
@@ -6,8 +6,6 @@ dependencies:
     - field.storage.node.field_channel
     - node.type.regulation
     - taxonomy.vocabulary.channels
-  content:
-    - 'taxonomy_term:channels:5a512a6a-01eb-43b3-9cf6-824c87bafbce'
   module:
     - custom_add_another
 third_party_settings:
@@ -22,10 +20,8 @@ label: Channel
 description: 'Use <a href="https://www.epa.gov/webguide/metadata-web-area-homepages#channel" class="external" target="_blank">this guide</a> for choosing the right channel.'
 required: true
 translatable: false
-default_value:
-  -
-    target_uuid: 5a512a6a-01eb-43b3-9cf6-824c87bafbce
-default_value_callback: ''
+default_value: {  }
+default_value_callback: 'epa_core_default_value_field_channel'
 settings:
   handler: 'default:taxonomy_term'
   handler_settings:
diff --git a/services/drupal/config/sync/field.field.node.regulation.field_type.yml b/services/drupal/config/sync/field.field.node.regulation.field_type.yml
index 66e2d1abfb..4dc25e9ef1 100644
--- a/services/drupal/config/sync/field.field.node.regulation.field_type.yml
+++ b/services/drupal/config/sync/field.field.node.regulation.field_type.yml
@@ -6,8 +6,6 @@ dependencies:
     - field.storage.node.field_type
     - node.type.regulation
     - taxonomy.vocabulary.type
-  content:
-    - 'taxonomy_term:type:8f6958bf-a20c-42fd-92dd-c7e70e255319'
   module:
     - custom_add_another
 third_party_settings:
@@ -22,10 +20,8 @@ label: Type
 description: 'Use <a href="https://www.epa.gov/webguide/metadata-basic-pages#type" class="external" target="_blank">this guide</a> for choosing the right type.'
 required: true
 translatable: false
-default_value:
-  -
-    target_uuid: 8f6958bf-a20c-42fd-92dd-c7e70e255319
-default_value_callback: ''
+default_value: {  }
+default_value_callback: 'epa_core_default_value_field_type'
 settings:
   handler: 'default:taxonomy_term'
   handler_settings:
diff --git a/services/drupal/web/modules/custom/epa_core/epa_core.module b/services/drupal/web/modules/custom/epa_core/epa_core.module
index c571d90502..81b91cd34c 100644
--- a/services/drupal/web/modules/custom/epa_core/epa_core.module
+++ b/services/drupal/web/modules/custom/epa_core/epa_core.module
@@ -516,6 +516,9 @@ function epa_core_default_value_field_type(ContentEntityInterface $entity, Field
       case 'perspective':
         $term_name = "speeches, testimony and transcripts";
         break;
+      case 'regulation':
+        $term_name = "other policies and guidance";
+        break;
     }
     if (!empty($term_name)) {
       $term = taxonomy_term_load_multiple_by_name($term_name, 'type');
@@ -527,6 +530,26 @@ function epa_core_default_value_field_type(ContentEntityInterface $entity, Field
   }
 }
 
+/**
+ * Provides default values for our channel fields across a couple content types.
+ */
+function epa_core_default_value_field_channel(ContentEntityInterface $entity, FieldDefinitionInterface $definition) {
+  if ($entity->getEntityTypeId() === 'node') {
+    switch ($entity->bundle()) {
+      case 'regulation':
+        $term_name = "laws & regulations";
+        break;
+    }
+    if (!empty($term_name)) {
+      $term = taxonomy_term_load_multiple_by_name($term_name, 'channels');
+      if (!empty($term)) {
+        $term = reset($term);
+        return $term->id();
+      }
+    }
+  }
+}
+
 /**
  * Implements hook_entity_operation_alter().
  */

From 75f1d4d39665fe8d2e0ac253d2bc7d0c44dcd374 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Thu, 30 Dec 2021 15:34:18 -0500
Subject: [PATCH 49/87] EPAD8-1568 add update hook to clear out orphaned
 paragraphs since these are blocking some save actions

---
 .../custom/epa_workflow/epa_workflow.install  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.install b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.install
index ae64731b43..2160be87f9 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.install
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.install
@@ -58,3 +58,25 @@ function epa_workflow_uninstall() {
   }
 
 }
+
+/**
+ * Deletes orphaned paragraphs.
+ */
+function epa_workflow_update_9000() {
+  // We're not really sure how these orphans got created.  We only have 6 of them.
+  //  select *, FROM_UNIXTIME(pifd.created) from paragraphs_item_revision_field_data pifd LEFT JOIN paragraphs_item_revision pi ON pi.revision_id = pifd.revision_id WHERE pi.revision_id IS NULL OR pi.type != pifd.type;
+  //+---------+-------------+--------------+----------+--------+------------+-----------+-------------+---------------------+-------------------+------------------+-------------------------------+------+-------------+------+----------+------------------+-----------------------------+
+  //| id      | revision_id | type         | langcode | status | created    | parent_id | parent_type | parent_field_name   | behavior_settings | default_langcode | revision_translation_affected | id   | revision_id | type | langcode | revision_default | FROM_UNIXTIME(pifd.created) |
+  //  +---------+-------------+--------------+----------+--------+------------+-----------+-------------+---------------------+-------------------+------------------+-------------------------------+------+-------------+------+----------+------------------+-----------------------------+
+  //| 1090951 |     1847933 | banner_slide | en       |      1 | 1632763188 | 241866    | paragraph   | field_banner_slides | a:0:{}            |                1 |                             1 | NULL |        NULL | NULL | NULL     |             NULL | 2021-09-27 17:19:48         |
+  //| 1094162 |     1847934 | banner_slide | en       |      1 | 1639416792 | 241866    | paragraph   | field_banner_slides | a:0:{}            |                1 |                             1 | NULL |        NULL | NULL | NULL     |             NULL | 2021-12-13 17:33:12         |
+  //|  158206 |     1847935 | banner_slide | en       |      1 | 1624109260 | 241866    | paragraph   | field_banner_slides | a:0:{}            |                1 |                             1 | NULL |        NULL | NULL | NULL     |             NULL | 2021-06-19 13:27:40         |
+  //| 1091753 |     1847936 | banner_slide | en       |      1 | 1634074251 | 241866    | paragraph   | field_banner_slides | a:0:{}            |                1 |                             1 | NULL |        NULL | NULL | NULL     |             NULL | 2021-10-12 21:30:51         |
+  //|  241866 |     1847937 | banner       | en       |      1 | 1624122642 | 34933     | node        | field_banner        | a:0:{}            |                1 |                             1 | NULL |        NULL | NULL | NULL     |             NULL | 2021-06-19 17:10:42         |
+  //| 1085709 |     1847938 | html         | en       |      1 | 1625770356 | 34933     | node        | field_paragraphs    | a:0:{}            |                1 |                             1 | NULL |        NULL | NULL | NULL     |             NULL | 2021-07-08 18:52:36         |
+  //  +---------+-------------+--------------+----------+--------+------------+-----------+-------------+---------------------+-------------------+------------------+-------------------------------+------+-------------+------+----------+------------------+-----------------------------+
+  \Drupal::database()->query(
+    "DELETE {paragraphs_item_revision_field_data} FROM {paragraphs_item_revision_field_data}
+    LEFT JOIN {paragraphs_item_revision} ON {paragraphs_item_revision}.revision_id = {paragraphs_item_revision_field_data}.revision_id
+        WHERE {paragraphs_item_revision}.revision_id IS NULL;")->execute();
+}

From be6f4c9dd697622249394a8ae4b598d7c80b4cd3 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Mon, 3 Jan 2022 10:49:36 -0500
Subject: [PATCH 50/87] EPAD8-1559 simplify deploy hook and rely on presave
 logic to extract authors correctly

---
 .../epa_workflow/epa_workflow.deploy.php      | 26 +++----------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.deploy.php b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.deploy.php
index 8fdfdb763b..4a17fd6dac 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.deploy.php
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.deploy.php
@@ -240,12 +240,12 @@ function epa_workflow_deploy_0006_populate_perspective_author_names_field(&$sand
   }
 
   $nids = \Drupal::database()->query(
-    "SELECT nid 
-          FROM {node} 
+    "SELECT nid
+          FROM {node}
           WHERE type = 'perspective' AND nid > :high_water_mark AND nid <= :highest_nid
           ORDER BY nid ASC
           LIMIT 25;", [
-            ':high_water_mark' => $sandbox['high_water_mark'], 
+            ':high_water_mark' => $sandbox['high_water_mark'],
             ':highest_nid' => $sandbox['highest_nid']
           ])
     ->fetchCol('nid');
@@ -265,26 +265,6 @@ function epa_workflow_deploy_0006_populate_perspective_author_names_field(&$sand
 
   foreach ($nodes as $node) {
     $sandbox['high_water_mark'] = $node->id();
-    if (!$node->field_authors->isEmpty()) {
-      $author_paragraphs = $node->field_authors->getValue();
-      $tids = [];
-      foreach ($author_paragraphs as $author) {
-        $target_id = $author['target_id'];
-        $paragraph = Drupal\paragraphs\Entity\Paragraph::load($target_id);
-        $author_tid = $paragraph->field_author->target_id;
-        array_push($tids, $author_tid);
-      }
-      $node->field_author_names = [];
-      foreach ($tids as $tid) {
-        $node->field_author_names[] = [
-          'target_id' => $tid
-        ];
-      }
-    }
-    else {
-      // Clear new field value if field_authors is empty.
-      $node->field_author_names = [];
-    }
     $node->save();
     $sandbox['current']++;
   }

From fa97f3ca5e551617499537bc59e18cd480fcdc1c Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Mon, 3 Jan 2022 20:05:17 -0800
Subject: [PATCH 51/87] [EPAD8-1546] Create field_share_image, add to webareas,
 update metatag config

---
 .../field.storage.group.field_share_image.yml | 20 +++++++++++
 .../sync/metatag.metatag_defaults.node.yml    | 34 ++++++++++++-------
 2 files changed, 42 insertions(+), 12 deletions(-)
 create mode 100644 services/drupal/config/sync/field.storage.group.field_share_image.yml

diff --git a/services/drupal/config/sync/field.storage.group.field_share_image.yml b/services/drupal/config/sync/field.storage.group.field_share_image.yml
new file mode 100644
index 0000000000..34a542930f
--- /dev/null
+++ b/services/drupal/config/sync/field.storage.group.field_share_image.yml
@@ -0,0 +1,20 @@
+uuid: fd3c1f30-b937-4533-acdb-38b5b6b430cb
+langcode: en
+status: true
+dependencies:
+  module:
+    - group
+    - media
+id: group.field_share_image
+field_name: field_share_image
+entity_type: group
+type: entity_reference
+settings:
+  target_type: media
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/services/drupal/config/sync/metatag.metatag_defaults.node.yml b/services/drupal/config/sync/metatag.metatag_defaults.node.yml
index 95e3193a67..5bdc42fb75 100644
--- a/services/drupal/config/sync/metatag.metatag_defaults.node.yml
+++ b/services/drupal/config/sync/metatag.metatag_defaults.node.yml
@@ -7,26 +7,36 @@ _core:
 id: node
 label: Content
 tags:
-  epa_title: '[node:title]'
-  epa_webarea: '[node:group:field_homepage:entity:title]'
-  epa_creator: '[node:group:field_publisher:entity:name]'
-  epa_regulation: '[node:field_env_laws_regs_and_treaties]'
   epa_channel: '[node:field_channel]'
-  epa_created: '[node:created:custom:Y-m-d]'
+  epa_contenttype: '[node:content-type]'
   epa_coverage: '[node:field_geographic_locations]'
-  epa_reviewed: '[node:field_review_deadline:date:custom:Y-m-d]'
-  epa_language: '[node:field_language:value]'
+  epa_created: '[node:created:custom:Y-m-d]'
+  epa_creator: '[node:group:field_publisher:entity:name]'
   epa_description: '[node:field_description:value]'
+  epa_language: '[node:field_language:value]'
   epa_modified: '[node:field_last_published:date:custom:Y-m-d]'
+  epa_regulation: '[node:field_env_laws_regs_and_treaties]'
+  epa_reviewed: '[node:field_review_deadline:date:custom:Y-m-d]'
+  epa_title: '[node:title]'
   epa_type: '[node:field_type]'
-  epa_contenttype: '[node:content-type]'
+  epa_webarea: '[node:group:field_homepage:entity:title]'
+  description: '[node:field_description:value]'
   keywords: '[node:field_keywords]'
   title: '[node:title] | [site:name]'
-  description: '[node:field_description:value]'
   article_modified_time: '[node:field_last_published:date:custom:Y-m-d]'
   article_published_time: '[node:created:custom:c]'
-  og_type: website
-  og_updated_time: '[node:field_last_published:date:custom:Y-m-d]'
-  og_description: '[node:field_description:value]'
   og_country_name: 'United States of America'
+  og_description: '[node:field_description:value]'
+  og_image: '[node:group:field_share_image:entity:field_media_image:url]'
+  og_image_alt: '[node:group:field_share_image:entity:field_media_image:alt]'
+  og_site_name: '[site:name]'
   og_title: '[node:title] | [site:name]'
+  og_type: '[node:content-type]'
+  og_updated_time: '[node:field_last_published:date:custom:Y-m-d]'
+  og_url: '[current-page:url:absolute]'
+  twitter_cards_description: '[node:field_description:value]'
+  twitter_cards_image: '[node:group:field_share_image]'
+  twitter_cards_image_alt: '[node:group:field_share_image:entity:field_media_image:alt]'
+  twitter_cards_page_url: '[current-page:url:absolute]'
+  twitter_cards_title: '[node:title] | [site:name]'
+  twitter_cards_type: summary_large_image

From 7b12dc85068abed97fcc399fa625722fd8128f3a Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Mon, 3 Jan 2022 20:21:34 -0800
Subject: [PATCH 52/87] [EPAD8-1546] Update image config

---
 services/drupal/config/sync/metatag.metatag_defaults.node.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/drupal/config/sync/metatag.metatag_defaults.node.yml b/services/drupal/config/sync/metatag.metatag_defaults.node.yml
index 5bdc42fb75..0e5facfea8 100644
--- a/services/drupal/config/sync/metatag.metatag_defaults.node.yml
+++ b/services/drupal/config/sync/metatag.metatag_defaults.node.yml
@@ -27,7 +27,7 @@ tags:
   article_published_time: '[node:created:custom:c]'
   og_country_name: 'United States of America'
   og_description: '[node:field_description:value]'
-  og_image: '[node:group:field_share_image:entity:field_media_image:url]'
+  og_image: '[node:group:field_share_image:entity:field_media_image:entity:url]'
   og_image_alt: '[node:group:field_share_image:entity:field_media_image:alt]'
   og_site_name: '[site:name]'
   og_title: '[node:title] | [site:name]'
@@ -35,7 +35,7 @@ tags:
   og_updated_time: '[node:field_last_published:date:custom:Y-m-d]'
   og_url: '[current-page:url:absolute]'
   twitter_cards_description: '[node:field_description:value]'
-  twitter_cards_image: '[node:group:field_share_image]'
+  twitter_cards_image: '[node:group:field_share_image:entity:field_media_image:entity:url]'
   twitter_cards_image_alt: '[node:group:field_share_image:entity:field_media_image:alt]'
   twitter_cards_page_url: '[current-page:url:absolute]'
   twitter_cards_title: '[node:title] | [site:name]'

From 4ec54c3ec99d27d2491e88f0474ca806cdd91e62 Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Mon, 3 Jan 2022 20:57:12 -0800
Subject: [PATCH 53/87] [EPAD8-1546] Add group config for field_share_image

---
 ...field.group.web_area.field_share_image.yml | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 services/drupal/config/sync/field.field.group.web_area.field_share_image.yml

diff --git a/services/drupal/config/sync/field.field.group.web_area.field_share_image.yml b/services/drupal/config/sync/field.field.group.web_area.field_share_image.yml
new file mode 100644
index 0000000000..4eaf1b9915
--- /dev/null
+++ b/services/drupal/config/sync/field.field.group.web_area.field_share_image.yml
@@ -0,0 +1,35 @@
+uuid: 9c0036ca-e224-426c-8b93-3e1013561426
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.group.field_share_image
+    - group.type.web_area
+    - media.type.image
+  module:
+    - custom_add_another
+third_party_settings:
+  custom_add_another:
+    custom_add_another: ''
+    custom_remove: ''
+id: group.web_area.field_share_image
+field_name: field_share_image
+entity_type: group
+bundle: web_area
+label: 'Share Image'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:media'
+  handler_settings:
+    target_bundles:
+      image: image
+    sort:
+      field: _none
+      direction: ASC
+    auto_create: false
+    auto_create_bundle: ''
+field_type: entity_reference

From 9eb38af036e62eec86d344ab87b89f8186f75436 Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Mon, 3 Jan 2022 21:36:26 -0800
Subject: [PATCH 54/87] [EPAD8-1546] Add form and display config

---
 ...re.entity_form_display.group.web_area.default.yml | 12 +++++++++++-
 ...re.entity_view_display.group.web_area.default.yml | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/services/drupal/config/sync/core.entity_form_display.group.web_area.default.yml b/services/drupal/config/sync/core.entity_form_display.group.web_area.default.yml
index 91d3ad8ccb..bcdbdb5b18 100644
--- a/services/drupal/config/sync/core.entity_form_display.group.web_area.default.yml
+++ b/services/drupal/config/sync/core.entity_form_display.group.web_area.default.yml
@@ -3,8 +3,8 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.group.web_area.field_allow_perspectives
     - field.field.group.web_area.field_allow_news_releases
+    - field.field.group.web_area.field_allow_perspectives
     - field.field.group.web_area.field_contact_us_form
     - field.field.group.web_area.field_editor_in_chief
     - field.field.group.web_area.field_homepage
@@ -13,9 +13,12 @@ dependencies:
     - field.field.group.web_area.field_migration_review_complete
     - field.field.group.web_area.field_navigation_style
     - field.field.group.web_area.field_publisher
+    - field.field.group.web_area.field_share_image
     - field.field.group.web_area.field_web_area_comments
     - field.field.group.web_area.field_web_council_representative
     - group.type.web_area
+  module:
+    - media_library
 id: group.web_area.default
 targetEntityType: group
 bundle: web_area
@@ -96,6 +99,13 @@ content:
     third_party_settings: {  }
     type: entity_reference_autocomplete
     region: content
+  field_share_image:
+    type: media_library_widget
+    weight: 13
+    settings:
+      media_types: {  }
+    third_party_settings: {  }
+    region: content
   field_web_area_comments:
     weight: 8
     settings:
diff --git a/services/drupal/config/sync/core.entity_view_display.group.web_area.default.yml b/services/drupal/config/sync/core.entity_view_display.group.web_area.default.yml
index f2b985b579..8cfaa6be78 100644
--- a/services/drupal/config/sync/core.entity_view_display.group.web_area.default.yml
+++ b/services/drupal/config/sync/core.entity_view_display.group.web_area.default.yml
@@ -3,8 +3,8 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.group.web_area.field_allow_perspectives
     - field.field.group.web_area.field_allow_news_releases
+    - field.field.group.web_area.field_allow_perspectives
     - field.field.group.web_area.field_contact_us_form
     - field.field.group.web_area.field_editor_in_chief
     - field.field.group.web_area.field_homepage
@@ -13,6 +13,7 @@ dependencies:
     - field.field.group.web_area.field_migration_review_complete
     - field.field.group.web_area.field_navigation_style
     - field.field.group.web_area.field_publisher
+    - field.field.group.web_area.field_share_image
     - field.field.group.web_area.field_web_area_comments
     - field.field.group.web_area.field_web_council_representative
     - group.type.web_area
@@ -110,6 +111,15 @@ content:
     third_party_settings: {  }
     type: entity_reference_label
     region: content
+  field_share_image:
+    type: entity_reference_entity_view
+    weight: 12
+    label: above
+    settings:
+      view_mode: default
+      link: false
+    third_party_settings: {  }
+    region: content
   field_web_area_comments:
     weight: 7
     label: above

From 94a9110f5594bdd8de50ef7b8e898cee4746a717 Mon Sep 17 00:00:00 2001
From: Michael Hessling <mike@cherrypj.com>
Date: Tue, 4 Jan 2022 12:52:56 -0500
Subject: [PATCH 55/87] EPAD8-1581 Add height/width to <th> elements

---
 services/drupal/config/sync/filter.format.filtered_html.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/drupal/config/sync/filter.format.filtered_html.yml b/services/drupal/config/sync/filter.format.filtered_html.yml
index fd7ab45e94..e63b1ef85c 100644
--- a/services/drupal/config/sync/filter.format.filtered_html.yml
+++ b/services/drupal/config/sync/filter.format.filtered_html.yml
@@ -34,7 +34,7 @@ filters:
     status: true
     weight: -48
     settings:
-      allowed_html: '<* accesskey aria-* class id role style tabindex title data data-* name hidden><a href hreflang occurrence id name target rel> <article> <div> <pre> <br> <p> <blockquote cite> <hr> <figure> <figcaption> <ol reversed start type> <ul type> <li> <dl> <dt> <dd> <address> <hgroup> <h2> <h3> <h4> <h5> <h6> <em> <i> <strong> <b> <small> <s> <section> <span> <sub> <sup> <mark> <abbr !title> <q cite> <cite> <ins data-date> <del cite datetime> <dfn> <time datetime pubdate> <var> <samp> <code> <kbd> <wbr> <bdo dir> <bdi> <ruby> <rt> <rp> <table summary width height> <colgroup span> <col span> <caption> <tbody> <thead> <tfoot> <tr> <th colspan headers rowspan scope> <td colspan headers rowspan scope width height> <details open> <summary> <form action method> <fieldset disabled form name> <legend> <label for form> <input checked size type value disabled placeholder required readonly autocomplete autofocus> <textarea rows cols disabled placeholder required readonly autocomplete autofocus> <meter min max low high optimum form value> <select multiple size> <optgroup disabled label> <option value> <output for form name> <button type value> <datalist> <keygen autofocus challenge disabled form keytype name> <progress max value> <img alt crossorigin height longdesc src width usemap data-caption data-align> <embed height src type width> <object form height name type usemap width> <param name value> <iframe allowfullscreen height name sandbox scrolling seamless src srcdoc width> <video autoplay buffered controls crossorigin height loop muted played preload poster src width> <audio autoplay buffered controls loop muted played preloadsrc> <source media src type> <track default kind label src srclang> <canvas height width> <map name> <area alt coords href hreflang media rel shape target type> <drupal-media data-caption data-align data-entity-type data-entity-uuid alt><drupal-inline-media data-entity-type data-entity-uuid><drupal-paragraph data-embed-button data-entity-label data-paragraph-id drupal-paragraph data-paragraph-revision-id>'
+      allowed_html: '<* accesskey aria-* class id role style tabindex title data data-* name hidden><a href hreflang occurrence id name target rel> <article> <div> <pre> <br> <p> <blockquote cite> <hr> <figure> <figcaption> <ol reversed start type> <ul type> <li> <dl> <dt> <dd> <address> <hgroup> <h2> <h3> <h4> <h5> <h6> <em> <i> <strong> <b> <small> <s> <section> <span> <sub> <sup> <mark> <abbr !title> <q cite> <cite> <ins data-date> <del cite datetime> <dfn> <time datetime pubdate> <var> <samp> <code> <kbd> <wbr> <bdo dir> <bdi> <ruby> <rt> <rp> <table summary width height> <colgroup span> <col span> <caption> <tbody> <thead> <tfoot> <tr> <th colspan headers height rowspan scope width> <td colspan headers rowspan scope width height> <details open> <summary> <form action method> <fieldset disabled form name> <legend> <label for form> <input checked size type value disabled placeholder required readonly autocomplete autofocus> <textarea rows cols disabled placeholder required readonly autocomplete autofocus> <meter min max low high optimum form value> <select multiple size> <optgroup disabled label> <option value> <output for form name> <button type value> <datalist> <keygen autofocus challenge disabled form keytype name> <progress max value> <img alt crossorigin height longdesc src width usemap data-caption data-align> <embed height src type width> <object form height name type usemap width> <param name value> <iframe allowfullscreen height name sandbox scrolling seamless src srcdoc width> <video autoplay buffered controls crossorigin height loop muted played preload poster src width> <audio autoplay buffered controls loop muted played preloadsrc> <source media src type> <track default kind label src srclang> <canvas height width> <map name> <area alt coords href hreflang media rel shape target type> <drupal-media data-caption data-align data-entity-type data-entity-uuid alt><drupal-inline-media data-entity-type data-entity-uuid><drupal-paragraph data-embed-button data-entity-label data-paragraph-id drupal-paragraph data-paragraph-revision-id>'
       filter_html_help: true
       filter_html_nofollow: false
   media_embed:

From 0f05ccf0462170864b55a889af6ad3c479d53b64 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Tue, 4 Jan 2022 17:24:06 -0500
Subject: [PATCH 56/87] EPAD8-1565 initial work to allow users to assign nodes
 to new groups

---
 services/drupal/composer.patches.json         |  6 ++-
 ...ld.field.node.regulation.field_channel.yml |  2 +-
 ...field.field.node.regulation.field_type.yml |  2 +-
 .../group.role.web_area-administrator.yml     | 14 +++---
 .../sync/group.role.web_area-anonymous.yml    |  2 +-
 .../sync/group.role.web_area-approver.yml     |  4 +-
 .../sync/group.role.web_area-editor.yml       | 10 ++--
 .../sync/group.role.web_area-member.yml       | 48 ++++++++++++++++---
 .../sync/group.role.web_area-outsider.yml     |  4 +-
 .../config/sync/user.role.authenticated.yml   |  1 +
 10 files changed, 67 insertions(+), 26 deletions(-)

diff --git a/services/drupal/composer.patches.json b/services/drupal/composer.patches.json
index 2ae8c99351..da75ec94a1 100644
--- a/services/drupal/composer.patches.json
+++ b/services/drupal/composer.patches.json
@@ -54,7 +54,8 @@
       "Use VBO with group permissions": "https://www.drupal.org/files/issues/2020-08-17/3020883-22.patch",
       "Avoid fatal errors with Layout Builder rendering by checking if group is being rendered in preview mode": "https://www.drupal.org/files/issues/2020-10-02/group-check_if_in_preview-3174615-2.patch",
       "Display node bundles in alpha order": "https://www.drupal.org/files/issues/2020-10-20/group-order_node_bundles-3178031-2.patch",
-      "Add contexts": "https://www.drupal.org/files/issues/2021-02-19/2815971-28.patch"
+      "Add contexts": "https://www.drupal.org/files/issues/2021-02-19/2815971-28.patch",
+      "Allow GroupQueryAccessHandler to accept any permission as an operation": "https://www.drupal.org/files/issues/2020-08-07/group-GroupQueryAccessHandler_permissions_as_oprations-3163943-3.patch"
     },
     "drupal/groupmedia": {
       "Display media bundles in alpha order": "https://www.drupal.org/files/issues/2020-10-20/groupmedia-order_bundles-3178034-3.patch"
@@ -198,6 +199,9 @@
     "drupal/diff": {
       "Patch diff interface to get language to match core patches in these issues: 3252521, 2899719, and 3252540": "patches/diff-patch-revision-language-to-match-3252521-2899719-3252540-2.patch",
       "Add classes to allow color-coding of revisions list": "https://www.drupal.org/files/issues/2021-12-03/diff-add_classes-3252547-2.patch"
+    },
+    "drupal/entitygroupfield":  {
+      "Limit available groups in widget to ones user has permission to.": "https://www.drupal.org/files/issues/2020-08-07/entitygroupfield-Autocomplete_permissions-3163814-4.patch"
     }
   }
 }
diff --git a/services/drupal/config/sync/field.field.node.regulation.field_channel.yml b/services/drupal/config/sync/field.field.node.regulation.field_channel.yml
index 6da10ed9a7..642414bef8 100644
--- a/services/drupal/config/sync/field.field.node.regulation.field_channel.yml
+++ b/services/drupal/config/sync/field.field.node.regulation.field_channel.yml
@@ -21,7 +21,7 @@ description: 'Use <a href="https://www.epa.gov/webguide/metadata-web-area-homepa
 required: true
 translatable: false
 default_value: {  }
-default_value_callback: 'epa_core_default_value_field_channel'
+default_value_callback: epa_core_default_value_field_channel
 settings:
   handler: 'default:taxonomy_term'
   handler_settings:
diff --git a/services/drupal/config/sync/field.field.node.regulation.field_type.yml b/services/drupal/config/sync/field.field.node.regulation.field_type.yml
index 4dc25e9ef1..3299bb6b4e 100644
--- a/services/drupal/config/sync/field.field.node.regulation.field_type.yml
+++ b/services/drupal/config/sync/field.field.node.regulation.field_type.yml
@@ -21,7 +21,7 @@ description: 'Use <a href="https://www.epa.gov/webguide/metadata-basic-pages#typ
 required: true
 translatable: false
 default_value: {  }
-default_value_callback: 'epa_core_default_value_field_type'
+default_value_callback: epa_core_default_value_field_type
 settings:
   handler: 'default:taxonomy_term'
   handler_settings:
diff --git a/services/drupal/config/sync/group.role.web_area-administrator.yml b/services/drupal/config/sync/group.role.web_area-administrator.yml
index f8b6fa22e6..df5a398765 100644
--- a/services/drupal/config/sync/group.role.web_area-administrator.yml
+++ b/services/drupal/config/sync/group.role.web_area-administrator.yml
@@ -22,11 +22,11 @@ permissions:
   - 'create group_media:image entity'
   - 'create group_media:other entity'
   - 'create group_media:remote_video entity'
-  - 'create group_node:perspective entity'
   - 'create group_node:event entity'
   - 'create group_node:faq entity'
   - 'create group_node:news_release entity'
   - 'create group_node:page entity'
+  - 'create group_node:perspective entity'
   - 'create group_node:public_notice entity'
   - 'create group_node:regulation entity'
   - 'create group_node:webform entity'
@@ -35,11 +35,11 @@ permissions:
   - 'delete any group_media:image entity'
   - 'delete any group_media:other entity'
   - 'delete any group_media:remote_video entity'
-  - 'delete any group_node:perspective entity'
   - 'delete any group_node:event entity'
   - 'delete any group_node:faq entity'
   - 'delete any group_node:news_release entity'
   - 'delete any group_node:page entity'
+  - 'delete any group_node:perspective entity'
   - 'delete any group_node:public_notice entity'
   - 'delete any group_node:regulation entity'
   - 'delete any group_node:webform entity'
@@ -48,11 +48,11 @@ permissions:
   - 'delete own group_media:image entity'
   - 'delete own group_media:other entity'
   - 'delete own group_media:remote_video entity'
-  - 'delete own group_node:perspective entity'
   - 'delete own group_node:event entity'
   - 'delete own group_node:faq entity'
   - 'delete own group_node:news_release entity'
   - 'delete own group_node:page entity'
+  - 'delete own group_node:perspective entity'
   - 'delete own group_node:public_notice entity'
   - 'delete own group_node:regulation entity'
   - 'delete own group_node:webform entity'
@@ -63,11 +63,11 @@ permissions:
   - 'update any group_media:image entity'
   - 'update any group_media:other entity'
   - 'update any group_media:remote_video entity'
-  - 'update any group_node:perspective entity'
   - 'update any group_node:event entity'
   - 'update any group_node:faq entity'
   - 'update any group_node:news_release entity'
   - 'update any group_node:page entity'
+  - 'update any group_node:perspective entity'
   - 'update any group_node:public_notice entity'
   - 'update any group_node:regulation entity'
   - 'update any group_node:web_area entity'
@@ -79,11 +79,11 @@ permissions:
   - 'update own group_media:other entity'
   - 'update own group_media:remote_video entity'
   - 'update own group_membership content'
-  - 'update own group_node:perspective entity'
   - 'update own group_node:event entity'
   - 'update own group_node:faq entity'
   - 'update own group_node:news_release entity'
   - 'update own group_node:page entity'
+  - 'update own group_node:perspective entity'
   - 'update own group_node:public_notice entity'
   - 'update own group_node:regulation entity'
   - 'update own group_node:web_area entity'
@@ -106,11 +106,11 @@ permissions:
   - 'view group_media:remote_video entity'
   - 'view group_membership content'
   - 'view group_menu:menu entity'
-  - 'view group_node:perspective entity'
   - 'view group_node:event entity'
   - 'view group_node:faq entity'
   - 'view group_node:news_release entity'
   - 'view group_node:page entity'
+  - 'view group_node:perspective entity'
   - 'view group_node:public_notice entity'
   - 'view group_node:regulation entity'
   - 'view group_node:web_area entity'
@@ -129,11 +129,11 @@ permissions:
   - 'view unpublished group_media:image entity'
   - 'view unpublished group_media:other entity'
   - 'view unpublished group_media:remote_video entity'
-  - 'view unpublished group_node:perspective entity'
   - 'view unpublished group_node:event entity'
   - 'view unpublished group_node:faq entity'
   - 'view unpublished group_node:news_release entity'
   - 'view unpublished group_node:page entity'
+  - 'view unpublished group_node:perspective entity'
   - 'view unpublished group_node:public_notice entity'
   - 'view unpublished group_node:regulation entity'
   - 'view unpublished group_node:web_area entity'
diff --git a/services/drupal/config/sync/group.role.web_area-anonymous.yml b/services/drupal/config/sync/group.role.web_area-anonymous.yml
index cec40aa394..13ec708636 100644
--- a/services/drupal/config/sync/group.role.web_area-anonymous.yml
+++ b/services/drupal/config/sync/group.role.web_area-anonymous.yml
@@ -18,11 +18,11 @@ permissions:
   - 'view group_media:image entity'
   - 'view group_media:other entity'
   - 'view group_media:remote_video entity'
-  - 'view group_node:perspective entity'
   - 'view group_node:event entity'
   - 'view group_node:faq entity'
   - 'view group_node:news_release entity'
   - 'view group_node:page entity'
+  - 'view group_node:perspective entity'
   - 'view group_node:public_notice entity'
   - 'view group_node:regulation entity'
   - 'view group_node:web_area entity'
diff --git a/services/drupal/config/sync/group.role.web_area-approver.yml b/services/drupal/config/sync/group.role.web_area-approver.yml
index f4a9c90a75..af5f7aa8f9 100644
--- a/services/drupal/config/sync/group.role.web_area-approver.yml
+++ b/services/drupal/config/sync/group.role.web_area-approver.yml
@@ -48,11 +48,11 @@ permissions:
   - 'view group_media:other entity'
   - 'view group_media:remote_video entity'
   - 'view group_menu:menu entity'
-  - 'view group_node:perspective entity'
   - 'view group_node:event entity'
   - 'view group_node:faq entity'
   - 'view group_node:news_release entity'
   - 'view group_node:page entity'
+  - 'view group_node:perspective entity'
   - 'view group_node:public_notice entity'
   - 'view group_node:regulation entity'
   - 'view group_node:web_area entity'
@@ -71,11 +71,11 @@ permissions:
   - 'view unpublished group_media:image entity'
   - 'view unpublished group_media:other entity'
   - 'view unpublished group_media:remote_video entity'
-  - 'view unpublished group_node:perspective entity'
   - 'view unpublished group_node:event entity'
   - 'view unpublished group_node:faq entity'
   - 'view unpublished group_node:news_release entity'
   - 'view unpublished group_node:page entity'
+  - 'view unpublished group_node:perspective entity'
   - 'view unpublished group_node:public_notice entity'
   - 'view unpublished group_node:regulation entity'
   - 'view unpublished group_node:web_area entity'
diff --git a/services/drupal/config/sync/group.role.web_area-editor.yml b/services/drupal/config/sync/group.role.web_area-editor.yml
index e45a240a40..ec35f5e6e5 100644
--- a/services/drupal/config/sync/group.role.web_area-editor.yml
+++ b/services/drupal/config/sync/group.role.web_area-editor.yml
@@ -15,11 +15,11 @@ permissions:
   - 'access group content menu overview'
   - 'access group_media overview'
   - 'access group_node overview'
-  - 'create group_node:perspective entity'
   - 'create group_node:event entity'
   - 'create group_node:faq entity'
   - 'create group_node:news_release entity'
   - 'create group_node:page entity'
+  - 'create group_node:perspective entity'
   - 'create group_node:public_notice entity'
   - 'create group_node:regulation entity'
   - 'create group_node:webform entity'
@@ -41,11 +41,11 @@ permissions:
   - 'update any group_media:image entity'
   - 'update any group_media:other entity'
   - 'update any group_media:remote_video entity'
-  - 'update any group_node:perspective entity'
   - 'update any group_node:event entity'
   - 'update any group_node:faq entity'
   - 'update any group_node:news_release entity'
   - 'update any group_node:page entity'
+  - 'update any group_node:perspective entity'
   - 'update any group_node:public_notice entity'
   - 'update any group_node:regulation entity'
   - 'update any group_node:web_area entity'
@@ -56,11 +56,11 @@ permissions:
   - 'update own group_media:image entity'
   - 'update own group_media:other entity'
   - 'update own group_media:remote_video entity'
-  - 'update own group_node:perspective entity'
   - 'update own group_node:event entity'
   - 'update own group_node:faq entity'
   - 'update own group_node:news_release entity'
   - 'update own group_node:page entity'
+  - 'update own group_node:perspective entity'
   - 'update own group_node:public_notice entity'
   - 'update own group_node:regulation entity'
   - 'update own group_node:web_area entity'
@@ -82,11 +82,11 @@ permissions:
   - 'view group_media:other entity'
   - 'view group_media:remote_video entity'
   - 'view group_menu:menu entity'
-  - 'view group_node:perspective entity'
   - 'view group_node:event entity'
   - 'view group_node:faq entity'
   - 'view group_node:news_release entity'
   - 'view group_node:page entity'
+  - 'view group_node:perspective entity'
   - 'view group_node:public_notice entity'
   - 'view group_node:regulation entity'
   - 'view group_node:web_area entity'
@@ -105,11 +105,11 @@ permissions:
   - 'view unpublished group_media:image entity'
   - 'view unpublished group_media:other entity'
   - 'view unpublished group_media:remote_video entity'
-  - 'view unpublished group_node:perspective entity'
   - 'view unpublished group_node:event entity'
   - 'view unpublished group_node:faq entity'
   - 'view unpublished group_node:news_release entity'
   - 'view unpublished group_node:page entity'
+  - 'view unpublished group_node:perspective entity'
   - 'view unpublished group_node:public_notice entity'
   - 'view unpublished group_node:regulation entity'
   - 'view unpublished group_node:web_area entity'
diff --git a/services/drupal/config/sync/group.role.web_area-member.yml b/services/drupal/config/sync/group.role.web_area-member.yml
index e25296af20..702d146f00 100644
--- a/services/drupal/config/sync/group.role.web_area-member.yml
+++ b/services/drupal/config/sync/group.role.web_area-member.yml
@@ -19,11 +19,11 @@ permissions:
   - 'create group_media:image entity'
   - 'create group_media:other entity'
   - 'create group_media:remote_video entity'
-  - 'create group_node:perspective entity'
   - 'create group_node:event entity'
   - 'create group_node:faq entity'
   - 'create group_node:news_release entity'
   - 'create group_node:page entity'
+  - 'create group_node:perspective entity'
   - 'create group_node:public_notice entity'
   - 'create group_node:regulation entity'
   - 'delete any group_media:audio entity'
@@ -31,42 +31,78 @@ permissions:
   - 'delete any group_media:image entity'
   - 'delete any group_media:other entity'
   - 'delete any group_media:remote_video entity'
+  - 'delete any group_node:event content'
+  - 'delete any group_node:faq content'
+  - 'delete any group_node:news_release content'
+  - 'delete any group_node:page content'
+  - 'delete any group_node:perspective content'
+  - 'delete any group_node:public_notice content'
+  - 'delete any group_node:regulation content'
+  - 'delete any group_node:web_area content'
+  - 'delete any group_node:webform content'
   - 'delete own group_media:audio entity'
   - 'delete own group_media:document entity'
   - 'delete own group_media:image entity'
   - 'delete own group_media:other entity'
   - 'delete own group_media:remote_video entity'
-  - 'delete own group_node:perspective entity'
+  - 'delete own group_node:event content'
   - 'delete own group_node:event entity'
+  - 'delete own group_node:faq content'
   - 'delete own group_node:faq entity'
+  - 'delete own group_node:news_release content'
   - 'delete own group_node:news_release entity'
+  - 'delete own group_node:page content'
   - 'delete own group_node:page entity'
+  - 'delete own group_node:perspective content'
+  - 'delete own group_node:perspective entity'
+  - 'delete own group_node:public_notice content'
   - 'delete own group_node:public_notice entity'
+  - 'delete own group_node:regulation content'
   - 'delete own group_node:regulation entity'
+  - 'delete own group_node:web_area content'
+  - 'delete own group_node:webform content'
   - 'update any group_media:audio entity'
   - 'update any group_media:document entity'
   - 'update any group_media:image entity'
   - 'update any group_media:other entity'
   - 'update any group_media:remote_video entity'
-  - 'update any group_node:perspective entity'
+  - 'update any group_node:event content'
   - 'update any group_node:event entity'
+  - 'update any group_node:faq content'
   - 'update any group_node:faq entity'
+  - 'update any group_node:news_release content'
   - 'update any group_node:news_release entity'
+  - 'update any group_node:page content'
   - 'update any group_node:page entity'
+  - 'update any group_node:perspective content'
+  - 'update any group_node:perspective entity'
+  - 'update any group_node:public_notice content'
   - 'update any group_node:public_notice entity'
+  - 'update any group_node:regulation content'
   - 'update any group_node:regulation entity'
+  - 'update any group_node:web_area content'
+  - 'update any group_node:webform content'
   - 'update own group_media:audio entity'
   - 'update own group_media:document entity'
   - 'update own group_media:image entity'
   - 'update own group_media:other entity'
   - 'update own group_media:remote_video entity'
-  - 'update own group_node:perspective entity'
+  - 'update own group_node:event content'
   - 'update own group_node:event entity'
+  - 'update own group_node:faq content'
   - 'update own group_node:faq entity'
+  - 'update own group_node:news_release content'
   - 'update own group_node:news_release entity'
+  - 'update own group_node:page content'
   - 'update own group_node:page entity'
+  - 'update own group_node:perspective content'
+  - 'update own group_node:perspective entity'
+  - 'update own group_node:public_notice content'
   - 'update own group_node:public_notice entity'
+  - 'update own group_node:regulation content'
   - 'update own group_node:regulation entity'
+  - 'update own group_node:web_area content'
+  - 'update own group_node:webform content'
   - 'use epa_default transition create_new_draft'
   - 'use epa_default transition return_to_author'
   - 'use epa_default transition send_for_review'
@@ -78,11 +114,11 @@ permissions:
   - 'view group_media:other entity'
   - 'view group_media:remote_video entity'
   - 'view group_menu:menu entity'
-  - 'view group_node:perspective entity'
   - 'view group_node:event entity'
   - 'view group_node:faq entity'
   - 'view group_node:news_release entity'
   - 'view group_node:page entity'
+  - 'view group_node:perspective entity'
   - 'view group_node:public_notice entity'
   - 'view group_node:regulation entity'
   - 'view group_node:web_area entity'
@@ -101,11 +137,11 @@ permissions:
   - 'view unpublished group_media:image entity'
   - 'view unpublished group_media:other entity'
   - 'view unpublished group_media:remote_video entity'
-  - 'view unpublished group_node:perspective entity'
   - 'view unpublished group_node:event entity'
   - 'view unpublished group_node:faq entity'
   - 'view unpublished group_node:news_release entity'
   - 'view unpublished group_node:page entity'
+  - 'view unpublished group_node:perspective entity'
   - 'view unpublished group_node:public_notice entity'
   - 'view unpublished group_node:regulation entity'
   - 'view unpublished group_node:web_area entity'
diff --git a/services/drupal/config/sync/group.role.web_area-outsider.yml b/services/drupal/config/sync/group.role.web_area-outsider.yml
index 3537bd3f7f..9af82e0b1c 100644
--- a/services/drupal/config/sync/group.role.web_area-outsider.yml
+++ b/services/drupal/config/sync/group.role.web_area-outsider.yml
@@ -18,21 +18,21 @@ permissions:
   - 'view group_media:image entity'
   - 'view group_media:other entity'
   - 'view group_media:remote_video entity'
-  - 'view group_node:perspective entity'
   - 'view group_node:event entity'
   - 'view group_node:faq entity'
   - 'view group_node:news_release entity'
   - 'view group_node:page entity'
+  - 'view group_node:perspective entity'
   - 'view group_node:public_notice entity'
   - 'view group_node:regulation entity'
   - 'view group_node:web_area entity'
   - 'view group_node:webform entity'
   - 'view latest version'
-  - 'view unpublished group_node:perspective entity'
   - 'view unpublished group_node:event entity'
   - 'view unpublished group_node:faq entity'
   - 'view unpublished group_node:news_release entity'
   - 'view unpublished group_node:page entity'
+  - 'view unpublished group_node:perspective entity'
   - 'view unpublished group_node:public_notice entity'
   - 'view unpublished group_node:regulation entity'
   - 'view unpublished group_node:web_area entity'
diff --git a/services/drupal/config/sync/user.role.authenticated.yml b/services/drupal/config/sync/user.role.authenticated.yml
index 38865d39f0..cbb38b614f 100644
--- a/services/drupal/config/sync/user.role.authenticated.yml
+++ b/services/drupal/config/sync/user.role.authenticated.yml
@@ -30,6 +30,7 @@ permissions:
   - 'create terms in keywords'
   - 'rabbit hole bypass group'
   - 'rabbit hole bypass media'
+  - 'reassign group content'
   - 'revert all revisions'
   - 'revert epa_default revisions to draft'
   - 'use admin toolbar search'

From e817ec6eed71e27a4fbd4eb9c105771bd1603207 Mon Sep 17 00:00:00 2001
From: Josh Wagner <jwagner@forumone.com>
Date: Wed, 5 Jan 2022 10:51:12 -0500
Subject: [PATCH 57/87] [EPAD8-1486] style existing box component for USWDS
 summary box

---
 .../03-uswds/summary-box/summary-box.md       |  1 +
 .../03-uswds/summary-box/summary-box.twig     | 30 +++++--
 .../paragraph/paragraph--box.html.twig        | 81 ++++++++++++-------
 3 files changed, 79 insertions(+), 33 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/summary-box/summary-box.md b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/summary-box/summary-box.md
index 3e2bf7f580..fd48d006d9 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/summary-box/summary-box.md
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/summary-box/summary-box.md
@@ -12,6 +12,7 @@ __Variables:__
 * constrain_modifier_classes: [string] Additional constrain classes used to
   control layout.
 * image: [string] Rendered image tag.
+* image_url: [string] URL to link image.
 * image_modifier_classes: [string] Classes to modify the default image styling.
 * heading: [string] Text of the heading.
 * heading_element: [string] HTML element used to wrap the heading. Defaults to h3.
diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/summary-box/summary-box.twig b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/summary-box/summary-box.twig
index aa9aaac4a5..b572070f26 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/summary-box/summary-box.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/summary-box/summary-box.twig
@@ -19,19 +19,37 @@
         image_modifier_classes ? image_modifier_classes,
       ]|join(' ')|trim %}
 
-      {% include '@components/figure/figure.twig' with {
-        'modifier_classes': image_classes,
-        'caption': false,
-        'media': image,
-      } %}
+      {% if image_url %}
+      <a class="usa-summary-box__image-link" href="{{ image_url }}">
+      {% endif %}
+
+        {% include '@components/figure/figure.twig' with {
+          'modifier_classes': image_classes,
+          'caption': false,
+          'media': image,
+        } %}
+
+      {% if image_url %}
+      </a>
+      {% endif %}
+
     {% endif %}
 
     {% if heading %}
-      <{{ heading_element ?: 'h3' }} class="usa-summary-box__heading" id="{{ summary_box_id }}">{{ heading }}</{{ heading_element ?: 'h3' }}>
+      <{{ heading_element ?: 'h3' }} class="usa-summary-box__heading" id="{{ summary_box_id }}">
+        {% if heading_url %}
+        <a href="{{ heading_url }}">
+        {% endif %}
+        {{ heading }}
+        {% if heading_url %}
+        </a>
+        {% endif %}
+      </{{ heading_element ?: 'h3' }}>
     {% endif %}
 
     <div class="usa-summary-box__text">
       {{ content }}
+      {{ footer_content }}
     </div>
   </div>
 </div>
diff --git a/services/drupal/web/themes/epa_theme/templates/paragraph/paragraph--box.html.twig b/services/drupal/web/themes/epa_theme/templates/paragraph/paragraph--box.html.twig
index 8555c511a1..6b42f09b8b 100644
--- a/services/drupal/web/themes/epa_theme/templates/paragraph/paragraph--box.html.twig
+++ b/services/drupal/web/themes/epa_theme/templates/paragraph/paragraph--box.html.twig
@@ -7,33 +7,60 @@
 
 {% set box_style = content.field_style|field_value|render %}
 
-{% set classes = [
-  box_style ? 'box--' ~ box_style,
-]|join(' ')|trim %}
-
-{% set icon = '' %}
-{% if box_style == 'alert' %}
-  {% set icon = 'warning' %}
-{% elseif box_style == 'rss' %}
-  {% set icon = 'rss' %}
+{% if box_style != 'default' %}
+
+  {% set classes = [
+    box_style ? 'box--' ~ box_style,
+  ]|join(' ')|trim %}
+
+  {% set icon = '' %}
+  {% if box_style == 'alert' %}
+    {% set icon = 'warning' %}
+  {% elseif box_style == 'rss' %}
+    {% set icon = 'rss' %}
+  {% endif %}
+
+  {% include '@components/box/box.twig' with {
+    'modifier_classes': classes,
+    'title': {
+      'tag': content.field_title_heading|field_value ? content.field_title_heading.0['#markup'] : 'h2',
+      'text': content.field_title|field_value|render,
+      'icon': icon,
+      'url': content.field_image|field_value|render ? '' : content.field_header_link.0['#url_title']
+    },
+    'image_url': content.field_header_link.0['#url_title'],
+    'image': content.field_image|field_value|render,
+    'content': content.field_paragraphs|field_value|render,
+    'footer': {
+      'text': content.field_link.0['#title'],
+      'url': content.field_link.0['#url_title'],
+    },
+    'role': box_style == 'alert' ? 'alert': false,
+    'label': box_style == 'alert' ? 'Alert'|t: false,
+  } %}
+
+{% else %}
+
+  {% set image_classes = [
+    'u-align-left',
+  ]|join(' ')|trim %}
+
+  {% if content.field_link|field_value %}
+    {% set footer_content %}
+      <p><a class="usa-button" href="{{ content.field_link.0['#url_title'] }}">{{ content.field_link.0['#title'] }}</a></p>
+    {% endset %}
+  {% endif %}
+
+  {% include '@uswds/summary-box/summary-box.twig' with {
+    'heading': content.field_title|field_value|render,
+    'heading_element': content.field_title_heading|field_value ? content.field_title_heading.0['#markup'] : 'h2',
+    'heading_url': content.field_header_link.0['#url_title'],
+    'image': content.field_image|field_value|render,
+    'content': content.field_paragraphs|field_value|render,
+    'footer_content': footer_content,
+    'image_modifier_classes': image_classes,
+  } %}
+
 {% endif %}
 
-{% include '@components/box/box.twig' with {
-  'modifier_classes': classes,
-  'title': {
-    'tag': content.field_title_heading|field_value ? content.field_title_heading.0['#markup'] : 'h2',
-    'text': content.field_title|field_value|render,
-    'icon': icon,
-    'url': content.field_image|field_value|render ? '' : content.field_header_link.0['#url_title']
-  },
-  'image_url': content.field_header_link.0['#url_title'],
-  'image': content.field_image|field_value|render,
-  'content': content.field_paragraphs|field_value|render,
-  'footer': {
-    'text': content.field_link.0['#title'],
-    'url': content.field_link.0['#url_title'],
-  },
-  'role': box_style == 'alert' ? 'alert': false,
-  'label': box_style == 'alert' ? 'Alert'|t: false,
-} %}
 {% set catch_cache = content|render %}

From c003272450a6c75afcf35d7a6f3c2a28bec7c748 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Wed, 5 Jan 2022 14:13:42 -0500
Subject: [PATCH 58/87] EPAD8-1565 ensure everyone who is allowed to publish
 can move content between groups. Also ensure you cannot just delete a group
 relationship

---
 .../sync/group.role.web_area-30cda0a61.yml    | 32 +++++++++++++++++
 .../group.role.web_area-administrator.yml     | 32 +++++++++++++++++
 .../sync/group.role.web_area-approver.yml     | 32 +++++++++++++++++
 .../sync/group.role.web_area-editor.yml       | 32 +++++++++++++++++
 .../sync/group.role.web_area-member.yml       | 36 -------------------
 .../src/Routing/RouteSubscriber.php           |  3 +-
 6 files changed, 130 insertions(+), 37 deletions(-)

diff --git a/services/drupal/config/sync/group.role.web_area-30cda0a61.yml b/services/drupal/config/sync/group.role.web_area-30cda0a61.yml
index 30a3c3368f..3d44cea173 100644
--- a/services/drupal/config/sync/group.role.web_area-30cda0a61.yml
+++ b/services/drupal/config/sync/group.role.web_area-30cda0a61.yml
@@ -37,26 +37,42 @@ permissions:
   - 'delete any group_media:image entity'
   - 'delete any group_media:other entity'
   - 'delete any group_media:remote_video entity'
+  - 'delete any group_node:event content'
   - 'delete any group_node:event entity'
+  - 'delete any group_node:faq content'
   - 'delete any group_node:faq entity'
+  - 'delete any group_node:news_release content'
   - 'delete any group_node:news_release entity'
+  - 'delete any group_node:page content'
   - 'delete any group_node:page entity'
+  - 'delete any group_node:perspective content'
   - 'delete any group_node:perspective entity'
+  - 'delete any group_node:public_notice content'
   - 'delete any group_node:public_notice entity'
+  - 'delete any group_node:regulation content'
   - 'delete any group_node:regulation entity'
+  - 'delete any group_node:webform content'
   - 'delete any group_node:webform entity'
   - 'delete own group_media:audio entity'
   - 'delete own group_media:document entity'
   - 'delete own group_media:image entity'
   - 'delete own group_media:other entity'
   - 'delete own group_media:remote_video entity'
+  - 'delete own group_node:event content'
   - 'delete own group_node:event entity'
+  - 'delete own group_node:faq content'
   - 'delete own group_node:faq entity'
+  - 'delete own group_node:news_release content'
   - 'delete own group_node:news_release entity'
+  - 'delete own group_node:page content'
   - 'delete own group_node:page entity'
+  - 'delete own group_node:perspective content'
   - 'delete own group_node:perspective entity'
+  - 'delete own group_node:public_notice content'
   - 'delete own group_node:public_notice entity'
+  - 'delete own group_node:regulation content'
   - 'delete own group_node:regulation entity'
+  - 'delete own group_node:webform content'
   - 'delete own group_node:webform entity'
   - 'manage group_content_menu'
   - 'update any group_media:audio entity'
@@ -64,14 +80,22 @@ permissions:
   - 'update any group_media:image entity'
   - 'update any group_media:other entity'
   - 'update any group_media:remote_video entity'
+  - 'update any group_node:event content'
   - 'update any group_node:event entity'
+  - 'update any group_node:faq content'
   - 'update any group_node:faq entity'
+  - 'update any group_node:news_release content'
   - 'update any group_node:news_release entity'
+  - 'update any group_node:page content'
   - 'update any group_node:page entity'
+  - 'update any group_node:perspective content'
   - 'update any group_node:perspective entity'
+  - 'update any group_node:public_notice content'
   - 'update any group_node:public_notice entity'
+  - 'update any group_node:regulation content'
   - 'update any group_node:regulation entity'
   - 'update any group_node:web_area entity'
+  - 'update any group_node:webform content'
   - 'update any group_node:webform entity'
   - 'update group_menu:menu entity'
   - 'update own group_media:audio entity'
@@ -79,14 +103,22 @@ permissions:
   - 'update own group_media:image entity'
   - 'update own group_media:other entity'
   - 'update own group_media:remote_video entity'
+  - 'update own group_node:event content'
   - 'update own group_node:event entity'
+  - 'update own group_node:faq content'
   - 'update own group_node:faq entity'
+  - 'update own group_node:news_release content'
   - 'update own group_node:news_release entity'
+  - 'update own group_node:page content'
   - 'update own group_node:page entity'
+  - 'update own group_node:perspective content'
   - 'update own group_node:perspective entity'
+  - 'update own group_node:public_notice content'
   - 'update own group_node:public_notice entity'
+  - 'update own group_node:regulation content'
   - 'update own group_node:regulation entity'
   - 'update own group_node:web_area entity'
+  - 'update own group_node:webform content'
   - 'update own group_node:webform entity'
   - 'view group'
   - 'view group_media:audio entity'
diff --git a/services/drupal/config/sync/group.role.web_area-administrator.yml b/services/drupal/config/sync/group.role.web_area-administrator.yml
index df5a398765..875cfa8790 100644
--- a/services/drupal/config/sync/group.role.web_area-administrator.yml
+++ b/services/drupal/config/sync/group.role.web_area-administrator.yml
@@ -35,26 +35,42 @@ permissions:
   - 'delete any group_media:image entity'
   - 'delete any group_media:other entity'
   - 'delete any group_media:remote_video entity'
+  - 'delete any group_node:event content'
   - 'delete any group_node:event entity'
+  - 'delete any group_node:faq content'
   - 'delete any group_node:faq entity'
+  - 'delete any group_node:news_release content'
   - 'delete any group_node:news_release entity'
+  - 'delete any group_node:page content'
   - 'delete any group_node:page entity'
+  - 'delete any group_node:perspective content'
   - 'delete any group_node:perspective entity'
+  - 'delete any group_node:public_notice content'
   - 'delete any group_node:public_notice entity'
+  - 'delete any group_node:regulation content'
   - 'delete any group_node:regulation entity'
+  - 'delete any group_node:webform content'
   - 'delete any group_node:webform entity'
   - 'delete own group_media:audio entity'
   - 'delete own group_media:document entity'
   - 'delete own group_media:image entity'
   - 'delete own group_media:other entity'
   - 'delete own group_media:remote_video entity'
+  - 'delete own group_node:event content'
   - 'delete own group_node:event entity'
+  - 'delete own group_node:faq content'
   - 'delete own group_node:faq entity'
+  - 'delete own group_node:news_release content'
   - 'delete own group_node:news_release entity'
+  - 'delete own group_node:page content'
   - 'delete own group_node:page entity'
+  - 'delete own group_node:perspective content'
   - 'delete own group_node:perspective entity'
+  - 'delete own group_node:public_notice content'
   - 'delete own group_node:public_notice entity'
+  - 'delete own group_node:regulation content'
   - 'delete own group_node:regulation entity'
+  - 'delete own group_node:webform content'
   - 'delete own group_node:webform entity'
   - 'manage group_content_menu'
   - 'manage group_content_menu menu items'
@@ -63,14 +79,22 @@ permissions:
   - 'update any group_media:image entity'
   - 'update any group_media:other entity'
   - 'update any group_media:remote_video entity'
+  - 'update any group_node:event content'
   - 'update any group_node:event entity'
+  - 'update any group_node:faq content'
   - 'update any group_node:faq entity'
+  - 'update any group_node:news_release content'
   - 'update any group_node:news_release entity'
+  - 'update any group_node:page content'
   - 'update any group_node:page entity'
+  - 'update any group_node:perspective content'
   - 'update any group_node:perspective entity'
+  - 'update any group_node:public_notice content'
   - 'update any group_node:public_notice entity'
+  - 'update any group_node:regulation content'
   - 'update any group_node:regulation entity'
   - 'update any group_node:web_area entity'
+  - 'update any group_node:webform content'
   - 'update any group_node:webform entity'
   - 'update group_menu:menu entity'
   - 'update own group_media:audio entity'
@@ -79,14 +103,22 @@ permissions:
   - 'update own group_media:other entity'
   - 'update own group_media:remote_video entity'
   - 'update own group_membership content'
+  - 'update own group_node:event content'
   - 'update own group_node:event entity'
+  - 'update own group_node:faq content'
   - 'update own group_node:faq entity'
+  - 'update own group_node:news_release content'
   - 'update own group_node:news_release entity'
+  - 'update own group_node:page content'
   - 'update own group_node:page entity'
+  - 'update own group_node:perspective content'
   - 'update own group_node:perspective entity'
+  - 'update own group_node:public_notice content'
   - 'update own group_node:public_notice entity'
+  - 'update own group_node:regulation content'
   - 'update own group_node:regulation entity'
   - 'update own group_node:web_area entity'
+  - 'update own group_node:webform content'
   - 'update own group_node:webform entity'
   - 'use epa_default transition approve_leave_unpublished'
   - 'use epa_default transition content_reviewed_republish'
diff --git a/services/drupal/config/sync/group.role.web_area-approver.yml b/services/drupal/config/sync/group.role.web_area-approver.yml
index af5f7aa8f9..013f94174d 100644
--- a/services/drupal/config/sync/group.role.web_area-approver.yml
+++ b/services/drupal/config/sync/group.role.web_area-approver.yml
@@ -19,21 +19,53 @@ permissions:
   - 'delete any group_media:image entity'
   - 'delete any group_media:other entity'
   - 'delete any group_media:remote_video entity'
+  - 'delete any group_node:event content'
+  - 'delete any group_node:faq content'
+  - 'delete any group_node:news_release content'
+  - 'delete any group_node:page content'
+  - 'delete any group_node:perspective content'
+  - 'delete any group_node:public_notice content'
+  - 'delete any group_node:regulation content'
+  - 'delete any group_node:webform content'
   - 'delete own group_media:audio entity'
   - 'delete own group_media:document entity'
   - 'delete own group_media:image entity'
   - 'delete own group_media:other entity'
   - 'delete own group_media:remote_video entity'
+  - 'delete own group_node:event content'
+  - 'delete own group_node:faq content'
+  - 'delete own group_node:news_release content'
+  - 'delete own group_node:page content'
+  - 'delete own group_node:perspective content'
+  - 'delete own group_node:public_notice content'
+  - 'delete own group_node:regulation content'
+  - 'delete own group_node:webform content'
   - 'update any group_media:audio entity'
   - 'update any group_media:document entity'
   - 'update any group_media:image entity'
   - 'update any group_media:other entity'
   - 'update any group_media:remote_video entity'
+  - 'update any group_node:event content'
+  - 'update any group_node:faq content'
+  - 'update any group_node:news_release content'
+  - 'update any group_node:page content'
+  - 'update any group_node:perspective content'
+  - 'update any group_node:public_notice content'
+  - 'update any group_node:regulation content'
+  - 'update any group_node:webform content'
   - 'update own group_media:audio entity'
   - 'update own group_media:document entity'
   - 'update own group_media:image entity'
   - 'update own group_media:other entity'
   - 'update own group_media:remote_video entity'
+  - 'update own group_node:event content'
+  - 'update own group_node:faq content'
+  - 'update own group_node:news_release content'
+  - 'update own group_node:page content'
+  - 'update own group_node:perspective content'
+  - 'update own group_node:public_notice content'
+  - 'update own group_node:regulation content'
+  - 'update own group_node:webform content'
   - 'use epa_default transition approve_leave_unpublished'
   - 'use epa_default transition content_reviewed_republish'
   - 'use epa_default transition create_new_draft'
diff --git a/services/drupal/config/sync/group.role.web_area-editor.yml b/services/drupal/config/sync/group.role.web_area-editor.yml
index ec35f5e6e5..137a96f4b6 100644
--- a/services/drupal/config/sync/group.role.web_area-editor.yml
+++ b/services/drupal/config/sync/group.role.web_area-editor.yml
@@ -28,11 +28,27 @@ permissions:
   - 'delete any group_media:image entity'
   - 'delete any group_media:other entity'
   - 'delete any group_media:remote_video entity'
+  - 'delete any group_node:event content'
+  - 'delete any group_node:faq content'
+  - 'delete any group_node:news_release content'
+  - 'delete any group_node:page content'
+  - 'delete any group_node:perspective content'
+  - 'delete any group_node:public_notice content'
+  - 'delete any group_node:regulation content'
+  - 'delete any group_node:webform content'
   - 'delete own group_media:audio entity'
   - 'delete own group_media:document entity'
   - 'delete own group_media:image entity'
   - 'delete own group_media:other entity'
   - 'delete own group_media:remote_video entity'
+  - 'delete own group_node:event content'
+  - 'delete own group_node:faq content'
+  - 'delete own group_node:news_release content'
+  - 'delete own group_node:page content'
+  - 'delete own group_node:perspective content'
+  - 'delete own group_node:public_notice content'
+  - 'delete own group_node:regulation content'
+  - 'delete own group_node:webform content'
   - 'delete own group_node:webform entity'
   - 'manage group_content_menu'
   - 'manage group_content_menu menu items'
@@ -41,14 +57,22 @@ permissions:
   - 'update any group_media:image entity'
   - 'update any group_media:other entity'
   - 'update any group_media:remote_video entity'
+  - 'update any group_node:event content'
   - 'update any group_node:event entity'
+  - 'update any group_node:faq content'
   - 'update any group_node:faq entity'
+  - 'update any group_node:news_release content'
   - 'update any group_node:news_release entity'
+  - 'update any group_node:page content'
   - 'update any group_node:page entity'
+  - 'update any group_node:perspective content'
   - 'update any group_node:perspective entity'
+  - 'update any group_node:public_notice content'
   - 'update any group_node:public_notice entity'
+  - 'update any group_node:regulation content'
   - 'update any group_node:regulation entity'
   - 'update any group_node:web_area entity'
+  - 'update any group_node:webform content'
   - 'update any group_node:webform entity'
   - 'update group_menu:menu entity'
   - 'update own group_media:audio entity'
@@ -56,14 +80,22 @@ permissions:
   - 'update own group_media:image entity'
   - 'update own group_media:other entity'
   - 'update own group_media:remote_video entity'
+  - 'update own group_node:event content'
   - 'update own group_node:event entity'
+  - 'update own group_node:faq content'
   - 'update own group_node:faq entity'
+  - 'update own group_node:news_release content'
   - 'update own group_node:news_release entity'
+  - 'update own group_node:page content'
   - 'update own group_node:page entity'
+  - 'update own group_node:perspective content'
   - 'update own group_node:perspective entity'
+  - 'update own group_node:public_notice content'
   - 'update own group_node:public_notice entity'
+  - 'update own group_node:regulation content'
   - 'update own group_node:regulation entity'
   - 'update own group_node:web_area entity'
+  - 'update own group_node:webform content'
   - 'update own group_node:webform entity'
   - 'use epa_default transition approve_leave_unpublished'
   - 'use epa_default transition content_reviewed_republish'
diff --git a/services/drupal/config/sync/group.role.web_area-member.yml b/services/drupal/config/sync/group.role.web_area-member.yml
index 702d146f00..3b99a5083e 100644
--- a/services/drupal/config/sync/group.role.web_area-member.yml
+++ b/services/drupal/config/sync/group.role.web_area-member.yml
@@ -31,78 +31,42 @@ permissions:
   - 'delete any group_media:image entity'
   - 'delete any group_media:other entity'
   - 'delete any group_media:remote_video entity'
-  - 'delete any group_node:event content'
-  - 'delete any group_node:faq content'
-  - 'delete any group_node:news_release content'
-  - 'delete any group_node:page content'
-  - 'delete any group_node:perspective content'
-  - 'delete any group_node:public_notice content'
-  - 'delete any group_node:regulation content'
-  - 'delete any group_node:web_area content'
-  - 'delete any group_node:webform content'
   - 'delete own group_media:audio entity'
   - 'delete own group_media:document entity'
   - 'delete own group_media:image entity'
   - 'delete own group_media:other entity'
   - 'delete own group_media:remote_video entity'
-  - 'delete own group_node:event content'
   - 'delete own group_node:event entity'
-  - 'delete own group_node:faq content'
   - 'delete own group_node:faq entity'
-  - 'delete own group_node:news_release content'
   - 'delete own group_node:news_release entity'
-  - 'delete own group_node:page content'
   - 'delete own group_node:page entity'
-  - 'delete own group_node:perspective content'
   - 'delete own group_node:perspective entity'
-  - 'delete own group_node:public_notice content'
   - 'delete own group_node:public_notice entity'
-  - 'delete own group_node:regulation content'
   - 'delete own group_node:regulation entity'
-  - 'delete own group_node:web_area content'
-  - 'delete own group_node:webform content'
   - 'update any group_media:audio entity'
   - 'update any group_media:document entity'
   - 'update any group_media:image entity'
   - 'update any group_media:other entity'
   - 'update any group_media:remote_video entity'
-  - 'update any group_node:event content'
   - 'update any group_node:event entity'
-  - 'update any group_node:faq content'
   - 'update any group_node:faq entity'
-  - 'update any group_node:news_release content'
   - 'update any group_node:news_release entity'
-  - 'update any group_node:page content'
   - 'update any group_node:page entity'
-  - 'update any group_node:perspective content'
   - 'update any group_node:perspective entity'
-  - 'update any group_node:public_notice content'
   - 'update any group_node:public_notice entity'
-  - 'update any group_node:regulation content'
   - 'update any group_node:regulation entity'
-  - 'update any group_node:web_area content'
-  - 'update any group_node:webform content'
   - 'update own group_media:audio entity'
   - 'update own group_media:document entity'
   - 'update own group_media:image entity'
   - 'update own group_media:other entity'
   - 'update own group_media:remote_video entity'
-  - 'update own group_node:event content'
   - 'update own group_node:event entity'
-  - 'update own group_node:faq content'
   - 'update own group_node:faq entity'
-  - 'update own group_node:news_release content'
   - 'update own group_node:news_release entity'
-  - 'update own group_node:page content'
   - 'update own group_node:page entity'
-  - 'update own group_node:perspective content'
   - 'update own group_node:perspective entity'
-  - 'update own group_node:public_notice content'
   - 'update own group_node:public_notice entity'
-  - 'update own group_node:regulation content'
   - 'update own group_node:regulation entity'
-  - 'update own group_node:web_area content'
-  - 'update own group_node:webform content'
   - 'use epa_default transition create_new_draft'
   - 'use epa_default transition return_to_author'
   - 'use epa_default transition send_for_review'
diff --git a/services/drupal/web/modules/custom/epa_web_areas/src/Routing/RouteSubscriber.php b/services/drupal/web/modules/custom/epa_web_areas/src/Routing/RouteSubscriber.php
index 2fe65e942e..7f994299af 100644
--- a/services/drupal/web/modules/custom/epa_web_areas/src/Routing/RouteSubscriber.php
+++ b/services/drupal/web/modules/custom/epa_web_areas/src/Routing/RouteSubscriber.php
@@ -34,7 +34,8 @@ public function __construct(ModuleHandlerInterface $module_handler) {
    */
   protected function alterRoutes(RouteCollection $collection) {
     // Always deny access to node/add and media/add to force group relationship.
-    $route_names = ['node.add', 'node.add_page', 'entity.media.add_page', 'entity.media.add_form'];
+    // Also deny access to the form used to delete group content entities since we want to avoid orphaned content.
+    $route_names = ['node.add', 'node.add_page', 'entity.media.add_page', 'entity.media.add_form', 'entity.group_content.delete_form'];
     foreach ($route_names as $route_name) {
       if ($route = $collection->get($route_name)) {
         $route->setRequirement('_access', 'FALSE');

From 772d12722eb5ad7ec3ff8d3a5ec18b5c3ac7c4b9 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Wed, 5 Jan 2022 17:27:36 -0500
Subject: [PATCH 59/87] EPAD8-1572 adds a publisher filter to the dashboard

---
 ...ld.field.node.regulation.field_channel.yml |  2 +-
 ...field.field.node.regulation.field_type.yml |  2 +-
 .../sync/views.view.moderated_content.yml     | 72 ++++++++++++++++++-
 .../sync/views.view.published_content.yml     | 67 +++++++++++++++++
 4 files changed, 140 insertions(+), 3 deletions(-)

diff --git a/services/drupal/config/sync/field.field.node.regulation.field_channel.yml b/services/drupal/config/sync/field.field.node.regulation.field_channel.yml
index 6da10ed9a7..642414bef8 100644
--- a/services/drupal/config/sync/field.field.node.regulation.field_channel.yml
+++ b/services/drupal/config/sync/field.field.node.regulation.field_channel.yml
@@ -21,7 +21,7 @@ description: 'Use <a href="https://www.epa.gov/webguide/metadata-web-area-homepa
 required: true
 translatable: false
 default_value: {  }
-default_value_callback: 'epa_core_default_value_field_channel'
+default_value_callback: epa_core_default_value_field_channel
 settings:
   handler: 'default:taxonomy_term'
   handler_settings:
diff --git a/services/drupal/config/sync/field.field.node.regulation.field_type.yml b/services/drupal/config/sync/field.field.node.regulation.field_type.yml
index 4dc25e9ef1..3299bb6b4e 100644
--- a/services/drupal/config/sync/field.field.node.regulation.field_type.yml
+++ b/services/drupal/config/sync/field.field.node.regulation.field_type.yml
@@ -21,7 +21,7 @@ description: 'Use <a href="https://www.epa.gov/webguide/metadata-basic-pages#typ
 required: true
 translatable: false
 default_value: {  }
-default_value_callback: 'epa_core_default_value_field_type'
+default_value_callback: epa_core_default_value_field_type
 settings:
   handler: 'default:taxonomy_term'
   handler_settings:
diff --git a/services/drupal/config/sync/views.view.moderated_content.yml b/services/drupal/config/sync/views.view.moderated_content.yml
index 1cee5e003f..e7eeecb4d2 100644
--- a/services/drupal/config/sync/views.view.moderated_content.yml
+++ b/services/drupal/config/sync/views.view.moderated_content.yml
@@ -2,11 +2,14 @@ uuid: e6a39dcc-7ac9-452d-bbac-3cd4c49f7c4d
 langcode: en
 status: true
 dependencies:
+  config:
+    - taxonomy.vocabulary.epa_organization
   module:
     - content_moderation
     - epa_web_areas
     - group
     - node
+    - taxonomy
     - user
     - views_autocomplete_filters
     - views_bulk_operations
@@ -993,6 +996,59 @@ display:
           entity_type: user
           entity_field: uid
           plugin_id: user_name
+        field_publisher_target_id:
+          id: field_publisher_target_id
+          table: group__field_publisher
+          field: field_publisher_target_id
+          relationship: gid
+          group_type: group
+          admin_label: ''
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_publisher_target_id_op
+            label: Publisher
+            description: ''
+            use_operator: false
+            operator: field_publisher_target_id_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: field_publisher_target_id
+            required: false
+            remember: false
+            multiple: true
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              layout_editor: '0'
+              alerts_manager: '0'
+              block_manager: '0'
+              system_editor: '0'
+              system_webmaster: '0'
+              menu_admin: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: false
+          type: textfield
+          limit: true
+          vid: epa_organization
+          hierarchy: false
+          error_message: true
+          plugin_id: taxonomy_index_tid
         moderation_state:
           id: moderation_state
           table: node_field_revision
@@ -1137,7 +1193,7 @@ display:
           admin_label: ''
           operator: in
           value: null
-          group: '1'
+          group: 1
           exposed: true
           expose:
             operator_id: users_in_groups_op
@@ -1234,6 +1290,17 @@ display:
             'group_node:web_area': '0'
           entity_type: node
           plugin_id: group_content_to_entity_reverse
+        gid:
+          id: gid
+          table: group_content_field_data
+          field: gid
+          relationship: group_content
+          group_type: group
+          admin_label: Group
+          required: false
+          entity_type: group_content
+          entity_field: gid
+          plugin_id: standard
       arguments: {  }
       display_extenders:
         views_ajax_get:
@@ -1254,6 +1321,7 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
+        - user
         - 'user.node_grants:view'
         - user.permissions
       tags:
@@ -1897,6 +1965,7 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
+        - user
         - 'user.node_grants:view'
         - user.permissions
       tags:
@@ -1919,6 +1988,7 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
+        - user
         - 'user.node_grants:view'
         - user.permissions
       tags:
diff --git a/services/drupal/config/sync/views.view.published_content.yml b/services/drupal/config/sync/views.view.published_content.yml
index d27b0f1607..8e80c16e00 100644
--- a/services/drupal/config/sync/views.view.published_content.yml
+++ b/services/drupal/config/sync/views.view.published_content.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - field.storage.node.field_review_deadline
+    - taxonomy.vocabulary.epa_organization
     - workflows.workflow.epa_default
   module:
     - content_moderation
@@ -11,6 +12,7 @@ dependencies:
     - epa_web_areas
     - group
     - node
+    - taxonomy
     - user
     - views_autocomplete_filters
 _core:
@@ -1313,6 +1315,17 @@ display:
             'group_node:web_area': '0'
           entity_type: node
           plugin_id: group_content_to_entity_reverse
+        gid:
+          id: gid
+          table: group_content_field_data
+          field: gid
+          relationship: group_content
+          group_type: group
+          admin_label: Group
+          required: false
+          entity_type: group_content
+          entity_field: gid
+          plugin_id: standard
       defaults:
         relationships: false
         filters: false
@@ -1658,6 +1671,59 @@ display:
             group_items: {  }
           entity_type: group_content
           plugin_id: epa_web_areas_users_groups
+        field_publisher_target_id:
+          id: field_publisher_target_id
+          table: group__field_publisher
+          field: field_publisher_target_id
+          relationship: gid
+          group_type: group
+          admin_label: ''
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_publisher_target_id_op
+            label: Publisher
+            description: ''
+            use_operator: false
+            operator: field_publisher_target_id_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: field_publisher_target_id
+            required: false
+            remember: false
+            multiple: true
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              layout_editor: '0'
+              alerts_manager: '0'
+              block_manager: '0'
+              system_editor: '0'
+              system_webmaster: '0'
+              menu_admin: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: false
+          type: textfield
+          limit: true
+          vid: epa_organization
+          hierarchy: false
+          error_message: true
+          plugin_id: taxonomy_index_tid
       filter_groups:
         operator: AND
         groups:
@@ -1672,6 +1738,7 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
+        - user
         - 'user.node_grants:view'
         - user.permissions
       max-age: -1

From 8f5ba30b0ee8d1227a02ca1acbcb638e4dba45c2 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Thu, 6 Jan 2022 09:55:25 -0500
Subject: [PATCH 60/87] Disallow crawling of pages in the themes directory

---
 services/drupal/web/robots.prod.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/drupal/web/robots.prod.txt b/services/drupal/web/robots.prod.txt
index 54da16277a..1327febef6 100644
--- a/services/drupal/web/robots.prod.txt
+++ b/services/drupal/web/robots.prod.txt
@@ -59,3 +59,5 @@ Disallow: /index.php/user/password/
 Disallow: /index.php/user/register/
 Disallow: /index.php/user/login/
 Disallow: /index.php/user/logout/
+# Theme artifacts (including pattern lab):
+Disallow: /themes/

From 9923d5cf97d41c49ccd6871dc2f286a5ac5cc49f Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Thu, 6 Jan 2022 14:46:55 -0500
Subject: [PATCH 61/87] Update robots to ensure we allow access to artifacts in
 our theme

---
 services/drupal/web/robots.prod.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/services/drupal/web/robots.prod.txt b/services/drupal/web/robots.prod.txt
index 1327febef6..6062a7172a 100644
--- a/services/drupal/web/robots.prod.txt
+++ b/services/drupal/web/robots.prod.txt
@@ -61,3 +61,12 @@ Disallow: /index.php/user/login/
 Disallow: /index.php/user/logout/
 # Theme artifacts (including pattern lab):
 Disallow: /themes/
+Allow: /themes/*.css$
+Allow: /themes/*.css?
+Allow: /themes/*.js$
+Allow: /themes/*.js?
+Allow: /themes/*.gif
+Allow: /themes/*.jpg
+Allow: /themes/*.jpeg
+Allow: /themes/*.png
+Allow: /themes/*.svg

From ce5438caf38a969f87f8183248d747c9515c5ab9 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Fri, 7 Jan 2022 10:33:34 -0500
Subject: [PATCH 62/87] EPAD8-1578 add wrappers and attributes necessary to
 support drag and drop in our layout

---
 .../epa_layouts/layouts/epa-resource-directory.html.twig  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/services/drupal/web/modules/custom/epa_layouts/layouts/epa-resource-directory.html.twig b/services/drupal/web/modules/custom/epa_layouts/layouts/epa-resource-directory.html.twig
index 0da8411c7b..9022478324 100644
--- a/services/drupal/web/modules/custom/epa_layouts/layouts/epa-resource-directory.html.twig
+++ b/services/drupal/web/modules/custom/epa_layouts/layouts/epa-resource-directory.html.twig
@@ -58,7 +58,7 @@
 
 {% if main_content|trim and content_sidebar %}
   {% set sidebar_classes = ['l-sidebar__sidebar'] %}
-  <div class="l-sidebar">
+  <div{{ attributes.addClass(['l-sidebar']) }}">
     <div class="l-sidebar__main">
       {{ main_content }}
     </div>
@@ -67,6 +67,8 @@
     </div>
   </div>
 {% else %}
-  {{ main_content }}
-  {{ content_sidebar }}
+  <div{{ attributes }}">
+    {{ main_content }}
+    {{ content_sidebar }}
+  </div>
 {% endif %}

From 2eb02cc57576bea0b81a3db2a1a22a69583f62ba Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Fri, 7 Jan 2022 11:03:06 -0500
Subject: [PATCH 63/87] EPAD8-1557 add email opt in and tags fields to users

---
 ....entity_form_display.user.user.default.yml | 60 +++++++++++++++++++
 ....entity_view_display.user.user.default.yml | 46 ++++++++++++++
 ...eld.field.user.user.field_email_opt_in.yml | 29 +++++++++
 .../sync/field.field.user.user.field_tags.yml | 35 +++++++++++
 .../field.storage.user.field_email_opt_in.yml | 18 ++++++
 .../sync/field.storage.user.field_tags.yml    | 20 +++++++
 ...ntent_settings.taxonomy_term.user_tags.yml | 11 ++++
 ...settings.taxonomy_vocabulary_user_tags.yml | 14 +++++
 .../sync/taxonomy.vocabulary.user_tags.yml    |  8 +++
 9 files changed, 241 insertions(+)
 create mode 100644 services/drupal/config/sync/core.entity_form_display.user.user.default.yml
 create mode 100644 services/drupal/config/sync/core.entity_view_display.user.user.default.yml
 create mode 100644 services/drupal/config/sync/field.field.user.user.field_email_opt_in.yml
 create mode 100644 services/drupal/config/sync/field.field.user.user.field_tags.yml
 create mode 100644 services/drupal/config/sync/field.storage.user.field_email_opt_in.yml
 create mode 100644 services/drupal/config/sync/field.storage.user.field_tags.yml
 create mode 100644 services/drupal/config/sync/language.content_settings.taxonomy_term.user_tags.yml
 create mode 100644 services/drupal/config/sync/rabbit_hole.behavior_settings.taxonomy_vocabulary_user_tags.yml
 create mode 100644 services/drupal/config/sync/taxonomy.vocabulary.user_tags.yml

diff --git a/services/drupal/config/sync/core.entity_form_display.user.user.default.yml b/services/drupal/config/sync/core.entity_form_display.user.user.default.yml
new file mode 100644
index 0000000000..121d49b39d
--- /dev/null
+++ b/services/drupal/config/sync/core.entity_form_display.user.user.default.yml
@@ -0,0 +1,60 @@
+uuid: 96221888-cb93-43aa-854a-4847df96b45f
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.user.user.field_email_opt_in
+    - field.field.user.user.field_tags
+  module:
+    - entitygroupfield
+    - user
+id: user.user.default
+targetEntityType: user
+bundle: user
+mode: default
+content:
+  account:
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  entitygroupfield:
+    type: entitygroupfield_select_widget
+    weight: 5
+    region: content
+    settings:
+      help_text: ''
+      label: 'Group name'
+      multiple: true
+      required: false
+    third_party_settings: {  }
+  field_email_opt_in:
+    weight: 1
+    settings:
+      display_label: true
+    third_party_settings: {  }
+    type: boolean_checkbox
+    region: content
+  field_tags:
+    weight: 2
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+    type: entity_reference_autocomplete_tags
+    region: content
+  language:
+    weight: 3
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  timezone:
+    weight: 4
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+hidden:
+  langcode: true
+  path: true
diff --git a/services/drupal/config/sync/core.entity_view_display.user.user.default.yml b/services/drupal/config/sync/core.entity_view_display.user.user.default.yml
new file mode 100644
index 0000000000..87cb5fbd18
--- /dev/null
+++ b/services/drupal/config/sync/core.entity_view_display.user.user.default.yml
@@ -0,0 +1,46 @@
+uuid: c883c7e5-9f4a-4b52-a575-58633610a722
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.user.user.field_email_opt_in
+    - field.field.user.user.field_tags
+  module:
+    - user
+id: user.user.default
+targetEntityType: user
+bundle: user
+mode: default
+content:
+  field_email_opt_in:
+    weight: 51
+    label: above
+    settings:
+      format: default
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    type: boolean
+    region: content
+  field_tags:
+    weight: 52
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    type: entity_reference_label
+    region: content
+  masquerade:
+    weight: 50
+    settings: {  }
+    third_party_settings: {  }
+    region: content
+  member_for:
+    weight: 5
+    settings: {  }
+    third_party_settings: {  }
+    region: content
+hidden:
+  entitygroupfield: true
+  langcode: true
+  search_api_excerpt: true
diff --git a/services/drupal/config/sync/field.field.user.user.field_email_opt_in.yml b/services/drupal/config/sync/field.field.user.user.field_email_opt_in.yml
new file mode 100644
index 0000000000..0411dff6d2
--- /dev/null
+++ b/services/drupal/config/sync/field.field.user.user.field_email_opt_in.yml
@@ -0,0 +1,29 @@
+uuid: 12dbde78-deb1-4c10-94f5-a2a270d92ad7
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.user.field_email_opt_in
+  module:
+    - custom_add_another
+    - user
+third_party_settings:
+  custom_add_another:
+    custom_add_another: ''
+    custom_remove: ''
+id: user.user.field_email_opt_in
+field_name: field_email_opt_in
+entity_type: user
+bundle: user
+label: 'Email opt in'
+description: 'User is opted in to receive informational emails from the Web CMS administrators.'
+required: false
+translatable: false
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'Yes'
+  off_label: 'No'
+field_type: boolean
diff --git a/services/drupal/config/sync/field.field.user.user.field_tags.yml b/services/drupal/config/sync/field.field.user.user.field_tags.yml
new file mode 100644
index 0000000000..e4344b1602
--- /dev/null
+++ b/services/drupal/config/sync/field.field.user.user.field_tags.yml
@@ -0,0 +1,35 @@
+uuid: af819317-b3e4-4054-ad49-c325ce5c2161
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.user.field_tags
+    - taxonomy.vocabulary.user_tags
+  module:
+    - custom_add_another
+    - user
+third_party_settings:
+  custom_add_another:
+    custom_add_another: 'Add another tag'
+    custom_remove: ''
+id: user.user.field_tags
+field_name: field_tags
+entity_type: user
+bundle: user
+label: Tags
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:taxonomy_term'
+  handler_settings:
+    target_bundles:
+      user_tags: user_tags
+    sort:
+      field: name
+      direction: asc
+    auto_create: false
+    auto_create_bundle: ''
+field_type: entity_reference
diff --git a/services/drupal/config/sync/field.storage.user.field_email_opt_in.yml b/services/drupal/config/sync/field.storage.user.field_email_opt_in.yml
new file mode 100644
index 0000000000..4c6f679d0d
--- /dev/null
+++ b/services/drupal/config/sync/field.storage.user.field_email_opt_in.yml
@@ -0,0 +1,18 @@
+uuid: 28077691-ce3b-49f3-adab-c0b8c3b78526
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+id: user.field_email_opt_in
+field_name: field_email_opt_in
+entity_type: user
+type: boolean
+settings: {  }
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/services/drupal/config/sync/field.storage.user.field_tags.yml b/services/drupal/config/sync/field.storage.user.field_tags.yml
new file mode 100644
index 0000000000..ec50ae6b77
--- /dev/null
+++ b/services/drupal/config/sync/field.storage.user.field_tags.yml
@@ -0,0 +1,20 @@
+uuid: f0f07664-1699-43df-8bb8-480769e7f054
+langcode: en
+status: true
+dependencies:
+  module:
+    - taxonomy
+    - user
+id: user.field_tags
+field_name: field_tags
+entity_type: user
+type: entity_reference
+settings:
+  target_type: taxonomy_term
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/services/drupal/config/sync/language.content_settings.taxonomy_term.user_tags.yml b/services/drupal/config/sync/language.content_settings.taxonomy_term.user_tags.yml
new file mode 100644
index 0000000000..f283b83bd9
--- /dev/null
+++ b/services/drupal/config/sync/language.content_settings.taxonomy_term.user_tags.yml
@@ -0,0 +1,11 @@
+uuid: 439e4884-5a57-47fa-9bf2-91f11a217b7a
+langcode: en
+status: true
+dependencies:
+  config:
+    - taxonomy.vocabulary.user_tags
+id: taxonomy_term.user_tags
+target_entity_type_id: taxonomy_term
+target_bundle: user_tags
+default_langcode: und
+language_alterable: false
diff --git a/services/drupal/config/sync/rabbit_hole.behavior_settings.taxonomy_vocabulary_user_tags.yml b/services/drupal/config/sync/rabbit_hole.behavior_settings.taxonomy_vocabulary_user_tags.yml
new file mode 100644
index 0000000000..7a92e4ac13
--- /dev/null
+++ b/services/drupal/config/sync/rabbit_hole.behavior_settings.taxonomy_vocabulary_user_tags.yml
@@ -0,0 +1,14 @@
+uuid: 7a82945f-e0c5-4869-820f-14a06c8eaf85
+langcode: en
+status: true
+dependencies:
+  config:
+    - taxonomy.vocabulary.user_tags
+id: taxonomy_vocabulary_user_tags
+entity_type_id: taxonomy_vocabulary
+entity_id: user_tags
+action: display_page
+allow_override: 1
+redirect: ''
+redirect_code: 301
+redirect_fallback_action: access_denied
diff --git a/services/drupal/config/sync/taxonomy.vocabulary.user_tags.yml b/services/drupal/config/sync/taxonomy.vocabulary.user_tags.yml
new file mode 100644
index 0000000000..386a6f3b0c
--- /dev/null
+++ b/services/drupal/config/sync/taxonomy.vocabulary.user_tags.yml
@@ -0,0 +1,8 @@
+uuid: f82d68c2-7b40-489d-85f1-d221ddd3a27d
+langcode: und
+status: true
+dependencies: {  }
+name: 'User tags'
+vid: user_tags
+description: 'Used to categorize users; mainly for the purpose of targeting specific groups with emails.'
+weight: 0

From 9b9a14844842047cd99d4c5ef54cc170622082eb Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Sat, 8 Jan 2022 22:19:47 -0800
Subject: [PATCH 64/87] [EPAD8-1585] Update compsoer.json for 2.2 compatibility

---
 services/drupal/composer.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/services/drupal/composer.json b/services/drupal/composer.json
index 5b3fb58737..515142bfaa 100644
--- a/services/drupal/composer.json
+++ b/services/drupal/composer.json
@@ -329,6 +329,12 @@
             "ext-opcache": "1.0.0",
             "ext-pdo": "1.0.0",
             "php": "7.4"
+        },
+        "allow-plugins": {
+            "composer/installers": true,
+            "cweagans/composer-patches": true,
+            "drupal/core-composer-scaffold": true,
+            "zaporylie/composer-drupal-optimizations": true
         }
     },
     "autoload": {

From 5278b6aa13fd3b81ada9dc7fa08bb5ade3d1f5b5 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Mon, 10 Jan 2022 17:07:35 -0500
Subject: [PATCH 65/87] EPAD8-1585 use forumone composer for the sake of
 consistency with other projects

---
 docker-compose.cli.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.cli.yml b/docker-compose.cli.yml
index c94872b687..e1ec7311eb 100644
--- a/docker-compose.cli.yml
+++ b/docker-compose.cli.yml
@@ -34,7 +34,7 @@ services:
 
   # This `composer' definition is what enables `f1 composer' to work.
   composer:
-    image: composer:2
+    image: forumone/composer:2
     volumes:
       - ./services/drupal:/app:cached
 

From cac5fee5086995cf69a08e925c91042276b4057b Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Tue, 11 Jan 2022 16:17:31 -0500
Subject: [PATCH 66/87] EPAD8-1486: Fix top margin on boxes with content before
 them

---
 .../epa_theme/source/_patterns/05-components/box/_box.scss    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/box/_box.scss b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/box/_box.scss
index 496889548a..c8cadc4411 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/05-components/box/_box.scss
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/05-components/box/_box.scss
@@ -15,6 +15,10 @@ $image-header-width: 320px;
     }
   }
 
+  * + & {
+    margin-top: rem(units(2));
+  }
+
   &.has-image-header {
     max-width: rem($image-header-width);
   }

From c7cd1333fd7985c4376a3a4b25faa0dbe3225307 Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Tue, 11 Jan 2022 16:33:51 -0500
Subject: [PATCH 67/87] EPAD8-1486: Update to match coding standards

---
 .../_patterns/03-uswds/summary-box/summary-box.twig   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/summary-box/summary-box.twig b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/summary-box/summary-box.twig
index b572070f26..25048c6368 100644
--- a/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/summary-box/summary-box.twig
+++ b/services/drupal/web/themes/epa_theme/source/_patterns/03-uswds/summary-box/summary-box.twig
@@ -20,7 +20,7 @@
       ]|join(' ')|trim %}
 
       {% if image_url %}
-      <a class="usa-summary-box__image-link" href="{{ image_url }}">
+        <a class="usa-summary-box__image-link" href="{{ image_url }}">
       {% endif %}
 
         {% include '@components/figure/figure.twig' with {
@@ -30,19 +30,20 @@
         } %}
 
       {% if image_url %}
-      </a>
+        </a>
       {% endif %}
-
     {% endif %}
 
     {% if heading %}
       <{{ heading_element ?: 'h3' }} class="usa-summary-box__heading" id="{{ summary_box_id }}">
         {% if heading_url %}
-        <a href="{{ heading_url }}">
+          <a href="{{ heading_url }}">
         {% endif %}
+
         {{ heading }}
+
         {% if heading_url %}
-        </a>
+          </a>
         {% endif %}
       </{{ heading_element ?: 'h3' }}>
     {% endif %}

From 5105974a764994d2969166994c6ca48185f56c27 Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Tue, 11 Jan 2022 20:15:11 -0800
Subject: [PATCH 68/87] [EPAD8-1474] Update link

---
 ...tent_moderation_notification.epa_content_about_to_expire.yml | 2 +-
 ...content_moderation_notification.epa_content_needs_review.yml | 2 +-
 ....content_moderation_notification.epa_content_will_expire.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_about_to_expire.yml b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_about_to_expire.yml
index c67e050154..0c51d07893 100644
--- a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_about_to_expire.yml
+++ b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_about_to_expire.yml
@@ -32,6 +32,6 @@ site_mail: false
 emails: ''
 subject: 'EPA Content About to Expire: [node:group:title] > [node:title]'
 body:
-  value: "<p>Hi, you have received this email because you are member of the [node:group:title] web area in EPA's Web Content Management System.</p>\r\n\r\n<p>If this page, [node:title], is not reviewed and republished by [node:field_review_deadline:date:long], it will no longer be visible to the public.</p>\r\n\r\n<p>If you are the content owner, or you help keep this page updated, please ensure it is up-to-date, edit if needed, and republish the page.</p>\r\n\r\n<p>Log in with your LAN ID and password to review this web page.</p>\r\n\r\n<p>&nbsp;</p>\r\n\r\n<p>[node:title]: <a href=\"[site:url]user/login?destination=[node:url:relative]\">[node:url]</a></p>\r\n\r\n<p>&nbsp;</p>\r\n\r\n<p>Unsure of what to do? Please see <a class=\"external-link\" href=\"https://www.epa.gov/drupaltraining/i-just-got-epa-content-about-expire-email-what-do-i-do\">https://www.epa.gov/drupaltraining/i-just-got-epa-content-about-expire-email-what-do-i-do</a></p>\r\n"
+  value: "<p>Hi, you have received this email because you are member of the [node:group:title] web area in EPA's Web Content Management System.</p>\r\n\r\n<p>If this page, [node:title], is not reviewed and republished by [node:field_review_deadline:date:long], it will no longer be visible to the public.</p>\r\n\r\n<p>If you are the content owner, or you help keep this page updated, please ensure it is up-to-date, edit if needed, and republish the page.</p>\r\n\r\n<p>Log in with your LAN ID and password to review this web page.</p>\r\n\r\n<p>&nbsp;</p>\r\n\r\n<p>[node:title]: <a href=\"[site:url]user/login?destination=[node:url:relative]\">[node:url]</a></p>\r\n\r\n<p>&nbsp;</p>\r\n\r\n<p>Unsure of what to do? Please see <a class=\"external-link\" href=\"https://www.epa.gov/webcmstraining/i-just-got-epa-content-about-expire-e-mail-what-do-i-do\">https://www.epa.gov/webcmstraining/i-just-got-epa-content-about-expire-e-mail-what-do-i-do</a></p>\r\n"
   format: unprocessed
 label: 'EPA Content About to Expire'
diff --git a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_needs_review.yml b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_needs_review.yml
index 42057cc3b8..51d8abf181 100644
--- a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_needs_review.yml
+++ b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_needs_review.yml
@@ -32,6 +32,6 @@ site_mail: false
 emails: ''
 subject: 'EPA Content Needs Review: [node:group:title] > [node:title]'
 body:
-  value: "<p>Hi, you have received this email because you are member of the [node:group:title] web area in EPA's Web Content Management System.</p>\r\n\r\n<p>If this page, [node:title], is not reviewed and republished by [node:field_review_deadline:date:long], it will no longer be visible to the public.</p>\r\n\r\n<p>If you are the content owner, or you help keep this page updated, please ensure it is up-to-date, edit if needed, and republish the page.</p>\r\n\r\n<p>Log in with your LAN ID and password to review this web page.</p>\r\n\r\n<p>&nbsp;</p>\r\n\r\n<p>[node:title]: <a href=\"[site:url]user/login?destination=[node:url:relative]\">[node:url]</a></p>\r\n\r\n<p>&nbsp;</p>\r\n\r\n<p>Unsure of what to do? Please see <a class=\"external-link\" href=\"https://www.epa.gov/drupaltraining/i-just-got-epa-content-about-expire-email-what-do-i-do\">https://www.epa.gov/drupaltraining/i-just-got-epa-content-about-expire-email-what-do-i-do</a></p>\r\n\r\n<p>&nbsp;</p>\r\n"
+  value: "<p>Hi, you have received this email because you are member of the [node:group:title] web area in EPA's Web Content Management System.</p>\r\n\r\n<p>If this page, [node:title], is not reviewed and republished by [node:field_review_deadline:date:long], it will no longer be visible to the public.</p>\r\n\r\n<p>If you are the content owner, or you help keep this page updated, please ensure it is up-to-date, edit if needed, and republish the page.</p>\r\n\r\n<p>Log in with your LAN ID and password to review this web page.</p>\r\n\r\n<p>&nbsp;</p>\r\n\r\n<p>[node:title]: <a href=\"[site:url]user/login?destination=[node:url:relative]\">[node:url]</a></p>\r\n\r\n<p>&nbsp;</p>\r\n\r\n<p>Unsure of what to do? Please see <a class=\"external-link\" href=\"https://www.epa.gov/webcmstraining/i-just-got-epa-content-about-expire-e-mail-what-do-i-do\">https://www.epa.gov/webcmstraining/i-just-got-epa-content-about-expire-e-mail-what-do-i-do</a></p>\r\n\r\n<p>&nbsp;</p>\r\n"
   format: unprocessed
 label: 'EPA Content Needs Review (Automatic)'
diff --git a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_will_expire.yml b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_will_expire.yml
index ff8835ace3..74942395e2 100644
--- a/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_will_expire.yml
+++ b/services/drupal/config/sync/content_moderation_notifications.content_moderation_notification.epa_content_will_expire.yml
@@ -32,6 +32,6 @@ site_mail: false
 emails: ''
 subject: 'EPA Content Will Expire Tomorrow: [node:group:title] > [node:title]'
 body:
-  value: "<p>Hi, you have received this email because you are member of the [node:group:title] web area in EPA's Web Content Management System.</p>\r\n\r\n<p>If this page, [node:title], is not reviewed and republished by [node:field_review_deadline:date:long], it will no longer be visible to the public.</p>\r\n\r\n<p>If you are the content owner, or you help keep this page updated, please ensure it is up-to-date, edit if needed, and republish the page.</p>\r\n\r\n<p>Log in with your LAN ID and password to review this web page.</p>\r\n\r\n<p>&nbsp;</p>\r\n\r\n<p>[node:title]: <a href=\"[site:url]user/login?destination=[node:url:relative]\">[node:url]</a></p>\r\n\r\n<p>&nbsp;</p>\r\n\r\n<p>Unsure of what to do? Please see <a class=\"external-link\" href=\"//www.epa.gov/drupaltraining/i-just-got-epa-content-about-expire-email-what-do-i-do\">https://www.epa.gov/drupaltraining/i-just-got-epa-content-about-expire-email-what-do-i-do</a></p>\r\n"
+  value: "<p>Hi, you have received this email because you are member of the [node:group:title] web area in EPA's Web Content Management System. a</p>\r\n\r\n<p>If this page, [node:title], is not reviewed and republished by [node:field_review_deadline:date:long], it will no longer be visible to the public.</p>\r\n\r\n<p>If you are the content owner, or you help keep this page updated, please ensure it is up-to-date, edit if needed, and republish the page.</p>\r\n\r\n<p>Log in with your LAN ID and password to review this web page.</p>\r\n\r\n<p>&nbsp;</p>\r\n\r\n<p>[node:title]: <a href=\"[site:url]user/login?destination=[node:url:relative]\">[node:url]</a></p>\r\n\r\n<p>&nbsp;</p>\r\n\r\n<p>Unsure of what to do? Please see <a class=\"external-link\" href=\"https://www.epa.gov/webcmstraining/i-just-got-epa-content-about-expire-e-mail-what-do-i-do\">https://www.epa.gov/webcmstraining/i-just-got-epa-content-about-expire-e-mail-what-do-i-do</a></p>\r\n"
   format: unprocessed
 label: 'EPA Content Will Expire Tomorrow'

From fccb487ee7c422244d5ba28cd863e54efeacaf66 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Wed, 12 Jan 2022 11:33:00 -0500
Subject: [PATCH 69/87] Update version of path_redirect_import for D9
 compatibility and put test redirects in local environment

---
 services/drupal/composer.lock   |  14 +-
 services/nginx/redirect_301.map | 296 +++++++++++++++++++++++++++++++-
 2 files changed, 302 insertions(+), 8 deletions(-)

diff --git a/services/drupal/composer.lock b/services/drupal/composer.lock
index 7216c93ac6..28ddec3469 100644
--- a/services/drupal/composer.lock
+++ b/services/drupal/composer.lock
@@ -7192,17 +7192,17 @@
         },
         {
             "name": "drupal/path_redirect_import",
-            "version": "1.0.0-beta4",
+            "version": "1.0.0-beta5",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/path_redirect_import.git",
-                "reference": "8.x-1.0-beta4"
+                "reference": "8.x-1.0-beta5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/path_redirect_import-8.x-1.0-beta4.zip",
-                "reference": "8.x-1.0-beta4",
-                "shasum": "c8414fc0d0154d740088a398f2759424e2d8b2fd"
+                "url": "https://ftp.drupal.org/files/projects/path_redirect_import-8.x-1.0-beta5.zip",
+                "reference": "8.x-1.0-beta5",
+                "shasum": "84bf22f684e0d001a5038960589939434a93994a"
             },
             "require": {
                 "drupal/core": "^8 || ^9",
@@ -7211,8 +7211,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.0-beta4",
-                    "datestamp": "1595182166",
+                    "version": "8.x-1.0-beta5",
+                    "datestamp": "1635359017",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Beta releases are not covered by Drupal security advisories."
diff --git a/services/nginx/redirect_301.map b/services/nginx/redirect_301.map
index 0507699825..6f06e36db6 100644
--- a/services/nginx/redirect_301.map
+++ b/services/nginx/redirect_301.map
@@ -4,4 +4,298 @@ map $request_uri $new_uri_301 {
 
      # entries of form:
      #/old-url /new-url;
-}
\ No newline at end of file
+
+    ~*^\/5yr(\/|$).* https://semspub.epa.gov/src/search;
+    ~*^\/about(\/|$).* /aboutepa;
+    ~*^\/adi(\/|$).* https://cfpub.epa.gov/adi;
+    ~*^\/aieo(\/|$).* /tribal;
+    ~*^\/air(\/|$).* /environmental-topics/air-topics;
+    ~*^\/aircompare(\/|$).* https://www3.epa.gov/aircompare/$1;
+    ~*^\/airdata(\/|$).* /outdoor-air-quality-data;
+    ~*^\/airexplorer(\/|$).* /outdoor-air-quality-data;
+    ~*^\/airmarket(\/|$).* /airmarkets/$1;
+    ~*^\/airnow(\/|$).* https://www.airnow.gov/;
+    ~*^\/airquality(\/|$).* https://www3.epa.gov/airquality/$1;
+    ~*^\/airtoxics(\/|$).* https://www3.epa.gov/airtoxics/$1;
+    ~*^\/airtransport(\/|$).* /interstate-air-pollution-transport/interstate-air-pollution-transport;
+    ~*^\/airtrends(\/|$).* /air-trends;
+    ~*^\/ampd(\/|$).* https://ampd.epa.gov/ampd;
+    ~*^\/approved-sips(\/|$).* /air-quality-implementation-plans;
+    ~*^\/apti(\/|$).* https://www.apti-learn.net/LMS/EPAHomePage.aspx;
+    ~*^\/aqi(\/|$).* https://www.airnow.gov/;
+    ~*^\/arweb(\/|$).* https://semspub.epa.gov;
+    ~*^\/beachkids(\/|$).* /beaches;
+    ~*^\/boarddec(\/|$).* https://yosemite.epa.gov/oa/EAB_Web_Docket.nsf;
+    ~*^\/boilercompliance(\/|$).* /stationary-sources-air-pollution/compliance-industrial-commercial-and-institutional-area-source;
+    ~*^\/cancerguidelines(\/|$).* /risk/guidelines-carcinogen-risk-assessment;
+    ~*^\/carbon-footprint-calculator(\/|$).* https://www3.epa.gov/carbon-footprint-calculator/$1;
+    ~*^\/carlabel(\/|$).* /fuel-economy;
+    ~*^\/cdr(\/|$).* /chemical-data-reporting;
+    ~*^\/ceampubl\/learn2model(\/|$).* https://www3.epa.gov/ceampubl/learn2model/$1;
+    ~*^\/ceppo(\/|$).* /oil-spills-prevention-and-preparedness-regulations;
+    ~*^\/cgi-bin\/airnow.cgi https://www3.epa.gov/cgi-bin/airnow.cgi$1;
+    ~*^\/cgi-bin\/mail.cgi https://www3.epa.gov/cgi-bin/mail.cgi$1;
+    ~*^\/cgi-bin\/schoolflagwidgetcurrent.cgi https://www3.epa.gov/cgi-bin/schoolflagwidgetcurrent.cgi$1;
+    ~*^\/cgi-bin\/schoolflagwidgetcurrentforecast.cgi https://www3.epa.gov/cgi-bin/schoolflagwidgetcurrentforecast.cgi$1;
+    ~*^\/cgi-bin\/schoolflagwidgettomorrowforecast.cgi https://www3.epa.gov/cgi-bin/schoolflagwidgettomorrowforecast.cgi$1;
+    ~*^\/cgi-bin\/widget.cgi https://www3.epa.gov/cgi-bin/widget.cgi$1;
+    ~*^\/chemfact(\/|$).* /assessing-and-managing-chemicals-under-tsca;
+    ~*^\/chemview(\/|$).* https://chemview.epa.gov/chemview;
+    ~*^\/chesapeakebaytmdl(\/|$).* /chesapeake-bay-tmdl;
+    ~*^\/chinese\/simple(\/|$).* /lep/traditional-chinese;
+    ~*^\/chinese(\/|$).* /lep/traditional-chinese;
+    ~*^\/cimc(\/|$).* /cleanups/cleanups-my-community;
+    ~*^\/citizenscience(\/|$).* /citizen-science;
+    ~*^\/civilrights(\/|$).* /ocr;
+    ~*^\/cleanairactbenefits(\/|$).* /clean-air-act-overview;
+    ~*^\/cleanenergy(\/|$).* /energy;
+    ~*^\/cleanpowerplan(\/|$).* /stationary-sources-air-pollution;
+    ~*^\/cleanpowerplantoolbox(\/|$).* /stationary-sources-air-pollution;
+    ~*^\/cleanup(\/|$).* /cleanups;
+    ~*^\/cleanup(\/|$).* /cleanups/$1;
+    ~*^\/cleanwaterrule(\/|$).* /nwpr;
+    ~*^\/climatechange(\/|$).* /climate-change;
+    ~*^\/climate-impacts(\/|$).* /sites/production/files/signpost/cc.html;
+    ~*^\/collisionrepair(\/|$).* /collision-repair-campaign;
+    ~*^\/composting(\/|$).* /sustainable-management-food;
+    ~*^\/comptox\/tox21(\/|$).* /chemical-research/toxicology-testing-21st-century-tox21;
+    ~*^\/cookstov(\/|$).* /indoor-air-quality-iaq;
+    ~*^\/cpp(\/|$).* /stationary-sources-air-pollution/$1;
+    ~*^\/cupps(\/|$).* /dwreginfo/information-about-public-water-systems;
+    ~*^\/datastandards(\/|$).* /data-standards;
+    ~*^\/dced(\/|$).* /smartgrowth/$1;
+    ~*^\/ders(\/|$).* https://ofmpub.epa.gov/sor_internet/registry/datareg/home/overview/home.do;
+    ~*^\/desastresnaturales(\/|$).* https://espanol.epa.gov;
+    ~*^\/dfe(\/|$).* /saferchoice;
+    ~*^\/dfesaferchoice(\/|$).* /saferchoice;
+    ~*^\/diesel(\/|$).* /dera;
+    ~*^\/dieselretrofits(\/|$).* /dera;
+    ~*^\/dis(\/|$).* https://iaspub.epa.gov/otaqpub/;
+    ~*^\/eab(\/|$).* https://yosemite.epa.gov/oa/EAB_Web_Docket.nsf;
+    ~*^\/echo(\/|$).* https://echo.epa.gov/;
+    ~*^\/economics(\/|$).* /environmental-economics;
+    ~*^\/edg(\/|$).* https://edg.epa.gov/metadata/catalog/main/home.page;
+    ~*^\/edm(\/|$).* /hesc/estuary-data-mapper;
+    ~*^\/eims(\/|$).* https://cfpub.epa.gov/si/;
+    ~*^\/emergenc(\/|$).* /natural-disasters;
+    ~*^\/EmergenciasNaturales(\/|$).* https://espanol.epa.gov/;
+    ~*^\/emergencies(\/|$).* /emergency-response;
+    ~*^\/endo(\/|$).* /endocrine-disruption/$1;
+    ~*^\/endocrine-disuptors(\/|$).* /endocrine-disruption/$1;
+    ~*^\/energy-independence(\/|$).* /stationary-sources-air-pollution;
+    ~*^\/enviro\/html\/fii(\/|$).* /frs;
+     ~*^\/epafiles\/?(.*) https://www3.epa.gov/epafiles/$1;
+    ~*^\/epeat(\/|$).* /greenerproducts;
+    ~*^\/epp(\/|$).* /greenerproducts;
+    ~*^\/erasc(\/|$).* https://cfpub.epa.gov/ncea/erasc/recordisplay.cfm?deid=154348;
+    ~*^\/espp(\/|$).* /endangered-species;
+    ~*^\/federalgreenchallenge(\/|$).* /fgc/$1;
+    ~*^\/fedrgstr(\/|$).* https://www.govinfo.gov/app/collection/FR/;
+    ~*^\/fem(\/|$).* /measurements-modeling;
+    ~*^\/finance(\/|$).* /aboutepa/about-office-chief-financial-officer-ocfo;
+    ~*^\/fishadvice(\/|$).* /choose-fish-and-shellfish-wisely;
+    ~*^\/foodrecovery(\/|$).* /sustainable-management-food;
+    ~*^\/foodscraps(\/|$).* /sustainable-management-food;
+    ~*^\/fumigantstatenotice(\/|$).* /soil-fumigants/complying-required-state-and-tribal-notification-soil-fumigations;
+    ~*^\/fumiganttraining(\/|$).* /soil-fumigants/soil-fumigant-training-certified-applicators;
+    ~*^\/gasstar(\/|$).* /natural-gas-star-program;
+    ~*^\/gateway\/learn(\/|$).* /learn-issues;
+    ~*^\/gateway\/science(\/|$).* /science-and-technology;
+    ~*^\/glnpo(\/|$).* /greatlakes;
+    ~*^\/globalchange(\/|$).* /climate-change;
+    ~*^\/globalmethane(\/|$).* /gmi;
+    ~*^\/globalwarming(\/|$).* /climate-change;
+    ~*^\/glossary(\/|$).* https://iaspub.epa.gov/sor_internet/registry/termreg/searchandretrieve/termsandacronyms/search.do;
+    ~*^\/gmpo(\/|$).* /gulfofmexico;
+    ~*^\/greeninfrastructure(\/|$).* /green-infrastructure;
+    ~*^\/greenproducts(\/|$).* /greenerproducts/$1;
+    ~*^\/grtlakes(\/|$).* /greatlakes;
+    ~*^\/guide(\/|$).* /eg;
+    ~*^\/healthexpfactors(\/|$).* https://cfpub.epa.gov/ncea/cfm/recordisplay.cfm?deid=20563;
+    ~*^\/healthrisk(\/|$).* /aboutepa/about-human-health-risk-assessment-program;
+    ~*^\/healthyheart(\/|$).* /air-research/healthy-heart-toolkit-and-research;
+    ~*^\/heasd\/airsensortoolbox(\/|$).* /air-sensor-toolbox;
+    ~*^\/hg(\/|$).* /mercury/$1;
+    ~*^\/homelandsecurityportal(\/|$).* /homeland-security;
+    ~*^\/hudson(\/|$).* /hudsonriverpcbs;
+    ~*^\/hurricane(\/|$).* /natural-disasters/hurricanes;
+    ~*^\/hurricanes(\/|$).* /natural-disasters/hurricanes;
+    ~*^\/hydraulicfracture(\/|$).* /uog;
+    ~*^\/iaplus01(\/|$).* /indoorairplus/$1;
+    ~*^\/iaq(\/|$).* /indoor-air-quality-iaq;
+    ~*^\/iaq\/schools(\/|$).* /iaq-schools;
+    ~*^\/indian(\/|$).* /tribal/$1;
+    ~*^\/indiantribal(\/|$).* /tribal;
+    ~*^\/inter508(\/|$).* /accessibility;
+    ~*^\/international(\/|$).* /international-cooperation;
+    ~*^\/international\/exports(\/|$).* /international-cooperation/export-promotion-epa;
+    ~*^\/jobs(\/|$).* /careers/$1;
+    ~*^\/katrina(\/|$).* https://archive.epa.gov/katrina/web/html/;
+    ~*^\/kids(\/|$).* /students;
+    ~*^\/korean(\/|$).* /lep/korean;
+    ~*^\/lakeerie(\/|$).* /greatlakes/lake-erie;
+    ~*^\/lakemich(\/|$).* /greatlakes/lake-michigan;
+    ~*^\/leaddesignations(\/|$).* /lead-designations;
+    ~*^\/livability(\/|$).* /smartgrowth/$1;
+    ~*^\/livablecommunities(\/|$).* /smartgrowth/$1;
+    ~*^\/mercury\/spills(\/|$).* /mercury;
+    ~*^\/myenvironment(\/|$).* https://enviro.epa.gov/;
+    ~*^\/nanoscience(\/|$).* /chemical-research/research-nanomaterials;
+    ~*^\/nata(\/|$).* /national-air-toxics-assessment;
+    ~*^\/nata2005(\/|$).* /national-air-toxics-assessment/2005-national-air-toxics-assessment;
+    ~*^\/naturaldisasters(\/|$).* /natural-disasters;
+    ~*^\/naturalemergencies(\/|$).* /natural-disasters;
+    ~*^\/nbh(\/|$).* /new-bedford-harbor;
+    ~*^\/ncea/\bmds\/bnchmrk\/bmds\/BMDSVERSION2.txt /bmds;
+    ~*^\/ncea\/global\/iclus(\/|$).* /gcx/about-iclus;
+    ~*^\/ncea\/isa(\/|$).* /isa;
+    ~*^\/ncee(\/|$).* /environmental-economics;
+    ~*^\/ncepi(\/|$).* /nscep/$1;
+    ~*^\/ncer\/p3(\/|$).* /p3;
+    ~*^\/ncer\/sbir(\/|$).* /sbir;
+    ~*^\/ncer(\/|$).* /research-grants;
+    ~*^\/netdmr(\/|$).* https://netdmr.zendesk.com/home;
+    ~*^\/newbedford(\/|$).* /new-bedford-harbor;
+    ~*^\/nhsrc(\/|$).* /emergency-response-research;
+    ~*^\/no2designations(\/|$).* /nitrogen-dioxide-designations;
+    ~*^\/nonroad(\/|$).* /vehicles-and-engines;
+    ~*^\/npdes\/pubs(\/|$).* https://www3.epa.gov/npdes/pubs/$1;
+    ~*^\/npdrought(\/|$).* https://cfpub.epa.gov/ncer_abstracts/index.cfm/fuseaction/recipients.display/rfa_id/589/records_per_page/ALL;
+    ~*^\/oalj(\/|$).* /alj;
+    ~*^\/oam(\/|$).* /contracts;
+    ~*^\/obd(\/|$).* /state-and-local-transportation;
+    ~*^\/oem(\/|$).* /emergency-response;
+    ~*^\/ogd(\/|$).* /grants;
+    ~*^\/oia(\/|$).* /international-cooperation;
+    ~*^\/oig(\/|$).* /office-inspector-general;
+    ~*^\/oilspill(\/|$).* /oil-spills-prevention-and-preparedness-regulations;
+    ~*^\/oita(\/|$).* /international-cooperation;
+    ~*^\/onestop(\/|$).* /exchangenetwork/$1;
+    ~*^\/oppt/(aegl|existingchemicals|exposure|greenengineering|import-export|newchems|pfoa|rsei|sf|spf)(\/|$).* /chemicals-under-tsca;
+    ~*^\/oppts(\/|$).* /aboutepa/about-office-chemical-safety-and-pollution-prevention-ocspp;
+    ~*^\/orcdizux\/(.*) https://www3.epa.gov/otaq/$1;
+    ~*^\/ord(\/|$).* /research;
+    ~*^\/osbp(\/|$).* /resources-small-businesses;
+    ~*^\/osp(\/|$).* /aboutepa/about-office-science-policy-osp;
+    ~*^\/ost(\/|$).* /environmental-topics/water-topics;
+    ~*^\/osw(\/|$).* /environmental-topics/land-waste-and-cleanup-topics;
+    ~*^\/otaq(\/|$).* /transportation-air-pollution-and-climate-change;
+    ~*^\/oust(\/|$).* /ust;
+    ~*^\/owm_keep(\/|$).* /owm/$1;
+    ~*^\/owow_keep(\/|$).* /owow/$1;
+    ~*^\/ozoneadvance(\/|$).* /advance;
+    ~*^\/ozonepmadvance(\/|$).* /advance;
+    ~*^\/particles(\/|$).* /pm-pollution;
+    ~*^\/peerreview(\/|$).* /programs-office-science-advisor-osa/current-science-and-technology-policy-council-projects;
+    ~*^\/PM(\/|$).* /pm-pollution;
+    ~*^\/pmadvance(\/|$).* /advance;
+    ~*^\/pmdesignations(\/|$).* /particle-pollution-designations;
+    ~*^\/pollutantdischarge(\/|$).* https://echo.epa.gov/trends/loading-tool/water-pollution-search;
+    ~*^\/pollutantdischarges(\/|$).* https://echo.epa.gov/trends/loading-tool/water-pollution-search;
+    ~*^\/ppic(\/|$).* /p2;
+    ~*^\/PR_Notices(\/|$).* /pesticide-registration/pesticide-registration-notices-year;
+    ~*^\/products(\/|$).* /greenerproducts/$1;
+    ~*^\/pugetsound(\/|$).* /puget-sound;
+    ~*^\/read(\/|$).* https://ofmpub.epa.gov/sor_internet/registry/systmreg/;
+    ~*^\/recyclecity(\/|$).* https://www3.epa.gov/recyclecity/$1;
+    ~*^\/recycling(\/|$).* /recycle/$1;
+    ~*^\/region01\/ge(\/|$).* /ge-housatonic;
+    ~*^\/region01(\/|$).* /aboutepa/epa-region-1-new-england;
+    ~*^\/region02(\/|$).* /aboutepa/epa-region-2;
+    ~*^\/region03(\/|$).* /aboutepa/epa-region-3-mid-atlantic;
+    ~*^\/region04(\/|$).* /aboutepa/about-epa-region-4-southeast;
+    ~*^\/region05(\/|$).* /aboutepa/epa-region-5;
+    ~*^\/region06(\/|$).* /aboutepa/epa-region-6-south-central;
+    ~*^\/region07(\/|$).* /aboutepa/epa-region-7-midwest;
+    ~*^\/region08(\/|$).* /aboutepa/epa-region-8-mountains-and-plains;
+    ~*^\/region09(\/|$).* /aboutepa/epa-region-9-pacific-southwest;
+    ~*^\/region1\/airquality(\/|$).* https://www3.epa.gov/region1/airquality/$1;
+    ~*^\/region1\/aqi(\/|$).* https://www3.epa.gov/region1/aqi/$1;
+    ~*^\/region1\/brownfields(\/|$).* /brownfields;
+    ~*^\/region1\/charles(\/|$).* /charlesriver;
+    ~*^\/region1\/eco/acidrain(\/|$).* /acidrain;
+    ~*^\/region1\/ge(\/|$).* /ge-housatonic;
+    ~*^\/region1\/mysticriver(\/|$).* /mysticriver;
+    ~*^\/region1\/npdes(\/|$).* /npdes-permits/npdes-water-permit-program-new-england;
+    ~*^\/region1\/sso(\/|$).* https://www3.epa.gov/region1/sso/$1;
+    ~*^\/region1(\/|$).* /aboutepa/epa-region-1-new-england;
+    ~*^\/region10(\/|$).* /aboutepa/epa-region-10-pacific-northwest;
+    ~*^\/region10\/pdf(\/|$).* https://www3.epa.gov/region10/pdf/$1;
+    ~*^\/region10\/videos(\/|$).* https://www3.epa.gov/region10/videos/$1;
+    ~*^\/region2(\/|$).* /aboutepa/epa-region-2;
+    ~*^\/region3\/mtntop(\/|$).* /sc-mining;
+    ~*^\/region3(\/|$).* /aboutepa/epa-region-3-mid-atlantic;
+    ~*^\/region4(\/|$).* /aboutepa/about-epa-region-4-southeast;
+    ~*^\/region5(\/|$).* /aboutepa/epa-region-5;
+    ~*^\/region6(\/|$).* /aboutepa/epa-region-6-south-central;
+    ~*^\/region7(\/|$).* /aboutepa/epa-region-7-midwest;
+    ~*^\/region9\/superfund\/prg(\/|$).* /risk/risk-based-screening-table-generic-tables;
+    ~*^\/region9\/tribal(\/|$).* /tribal/region-9-tribal-program;
+    ~*^\/region9(\/|$).* /aboutepa/epa-region-9-pacific-southwest;
+    ~*^\/regulations(\/|$).* /lawsregs/$1;
+    ~*^\/renewableenergyland(\/|$).* /re-powering;
+    ~*^\/research\/chemicalscience(\/|$).* /chemical-research;
+    ~*^\/research\/ecoscience(\/|$).* /eco-research;
+    ~*^\/retigo(\/|$).* /hesc/real-time-geospatial-data-viewer;
+    ~*^\/rfa(\/|$).* /reg-flex;
+    ~*^\/risk_assessment(\/|$).* /risk/$1;
+    ~*^\/riskassessment(\/|$).* /risk/$1;
+    ~*^\/riskassessmentforum(\/|$).* /osa/basic-information-about-risk-assessment-guidelines-development;
+    ~*^\/rsig(\/|$).* /hesc/remote-sensing-information-gateway;
+    ~*^\/rtp(\/|$).* /aboutepa/about-epas-campus-research-triangle-park-rtp-north-carolina;
+    ~*^\/rtpspeakers(\/|$).* /rtp-speakers-bureau;
+    ~*^\/sabstaff(\/|$).* https://yosemite.epa.gov/sab/sabproduct.nsf/Web/index?OpenDocument;
+    ~*^\/safewater_keep(\/|$).* /ground-water-and-drinking-water;
+    ~*^\/safewater\/kids(\/|$).* https://www3.epa.gov/safewater/kids/$1;
+    ~*^\/sam(\/|$).* /esam/selected-analytical-methods-environmental-remediation-and-recovery-sam;
+    ~*^\/sbrefa(\/|$).* /reg-flex;
+    ~*^\/science(\/|$).* https://cfpub.epa.gov/si/;
+    ~*^\/science1(\/|$).* https://yosemite.epa.gov/sab/sabpeople.nsf/WebCommittees/BOARD;
+    ~*^\/scientificintegrity(\/|$).* /osa/basic-information-about-scientific-integrity;
+    ~*^\/scram001(\/|$).* /scram;
+    ~*^\/septicsmart(\/|$).* /septic;
+    ~*^\/sfbaydelta(\/|$).* /sfbay-delta;
+    ~*^\/sjv(\/|$).* /sanjoaquinvalley;
+    ~*^\/smallbusiness(\/|$).* /resources-small-businesses;
+    ~*^\/smartwaylogistics(\/|$).* /smartway/$1;
+    ~*^\/smartwaymanufacturers(\/|$).* /smartway/$1;
+    ~*^\/smartwayshipper(\/|$).* /smartway/$1;
+    ~*^\/smartwayshipping(\/|$).* /smartway/$1;
+    ~*^\/smartwaytransport(\/|$).* /smartway/$1;
+    ~*^\/so2designations(\/|$).* /sulfur-dioxide-designations;
+    ~*^\/solidwaste(\/|$).* /environmental-topics/land-waste-and-cleanup-topics;
+    ~*^\/sor(\/|$).* https://ofmpub.epa.gov/sor_internet/registry/sysofreg/home/overview/home.do;
+    ~*^\/spanish(\/|$).* https://espanol.epa.gov/;
+    ~*^\/srs(\/|$).* https://ofmpub.epa.gov/sor_internet/registry/substreg/LandingPage.do;
+    ~*^\/statelocalclimate(\/|$).* /statelocalenergy;
+    ~*^\/stateply(\/|$).* /climateleadership/$1;
+    ~*^\/storet(\/|$).* /waterdata/water-quality-data-wqx;
+    ~*^\/sunwise(\/|$).* /sunsafety;
+    ~*^\/surf3(\/|$).* /waterdata/surf-your-watershed;
+    ~*^\/sustainablemanufacturing(\/|$).* https://archive.epa.gov/sustainablemanufacturing/web/html/;
+    ~*^\/tio(\/|$).* /remedytech;
+    ~*^\/tribalportal(\/|$).* /tribal/$1;
+    ~*^\/ts(\/|$).* https://ofmpub.epa.gov/sor_internet/registry/termreg/searchandretrieve/termsandacronyms/search.do;
+    ~*^\/ttn(\/|$).* /technical-air-pollution-resources;
+    ~*^\/ttnmain1(\/|$).* /technical-air-pollution-resources;
+    ~*^\/uv-net(\/|$).* /uvnet/$1;
+    ~*^\/waste\/homeland(\/|$).* /homeland-security-waste;
+    ~*^\/waste(\/|$).* /environmental-topics/land-waste-and-cleanup-topics;
+    ~*^\/water(\/|$).* /environmental-topics/water-topics;
+    ~*^\/waterscience_keep(\/|$).* /environmental-topics/water-topics;
+    ~*^\/waterscience/(beaches|fish|fishadvice|standards|ftp/basins)(\/|$).* /environmental-topics/water-topics;
+    ~*^\/waterscience\/fish(\/|$).* /fish-tech;
+    ~*^\/waterscience\/ftp\/basins\/met_data(\/|$).* https://www3.epa.gov/ceampubl/basins/met_data/$1;
+    ~*^\/watershedwebcasts(\/|$).* /watershedacademy;
+    ~*^\/webice(\/|$).* https://www3.epa.gov/webice/$1;
+    ~*^\/wetlandmitigation(\/|$).* /wetlands/$1;
+    ~*^\/wetlandsmitigation(\/|$).* /wetlands/$1;
+    ~*^\/wheat(\/|$).* /waterriskassessment/find-out-about-health-and-economic-impacts-water-utility-emergencies;
+    ~*^\/widgets(\/|$).* https://developer.epa.gov/category/widgets/;
+    ~*^\/wildfire(\/|$).* /natural-disasters/wildfires;
+    ~*^\/wqshandbook(\/|$).* /wqs-tech/water-quality-standards-handbook;
+    ~*^\/wqslibrary(\/|$).* /wqs-tech/reference-library-water-quality-standards-policy-and-guidance-documents;
+    ~*^\/wqsrepository(\/|$).* /wqs-tech/state-specific-water-quality-standards-effective-under-clean-water-act-cwa;
+    ~*^\/wtc(\/|$).* https://archive.epa.gov/wtc/web/html/;
+
+}

From c30261a116a9c02ed9db48161b012b1623e06f23 Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Wed, 12 Jan 2022 22:23:22 -0800
Subject: [PATCH 70/87] [EPAD8-1579] Update Publish Date help text.

---
 .../config/sync/field.field.node.event.field_publish_date.yml   | 2 +-
 .../config/sync/field.field.node.faq.field_publish_date.yml     | 2 +-
 .../sync/field.field.node.news_release.field_publish_date.yml   | 2 +-
 .../config/sync/field.field.node.page.field_publish_date.yml    | 2 +-
 .../sync/field.field.node.perspective.field_publish_date.yml    | 2 +-
 .../sync/field.field.node.public_notice.field_publish_date.yml  | 2 +-
 .../sync/field.field.node.regulation.field_publish_date.yml     | 2 +-
 .../sync/field.field.node.web_area.field_publish_date.yml       | 2 +-
 .../config/sync/field.field.node.webform.field_publish_date.yml | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/services/drupal/config/sync/field.field.node.event.field_publish_date.yml b/services/drupal/config/sync/field.field.node.event.field_publish_date.yml
index 7bcf7ee58e..c15a17d33b 100644
--- a/services/drupal/config/sync/field.field.node.event.field_publish_date.yml
+++ b/services/drupal/config/sync/field.field.node.event.field_publish_date.yml
@@ -17,7 +17,7 @@ field_name: field_publish_date
 entity_type: node
 bundle: event
 label: 'Publish Date'
-description: 'Publication will occur within 15 minutes of the time you select. If you need exact timing, manually publish this content.'
+description: 'Publication will occur within 15 minutes of the time you select. If you need exact timing, manually publish this content. Note that this revision must be in the "Draft, approved" state in order to be automatically published at the selected time.'
 required: false
 translatable: false
 default_value: {  }
diff --git a/services/drupal/config/sync/field.field.node.faq.field_publish_date.yml b/services/drupal/config/sync/field.field.node.faq.field_publish_date.yml
index 6e4868961d..cf91fc25ff 100644
--- a/services/drupal/config/sync/field.field.node.faq.field_publish_date.yml
+++ b/services/drupal/config/sync/field.field.node.faq.field_publish_date.yml
@@ -17,7 +17,7 @@ field_name: field_publish_date
 entity_type: node
 bundle: faq
 label: 'Publish Date'
-description: 'Publication will occur within 15 minutes of the time you select. If you need exact timing, manually publish this content.'
+description: 'Publication will occur within 15 minutes of the time you select. If you need exact timing, manually publish this content. Note that this revision must be in the "Draft, approved" state in order to be automatically published at the selected time.'
 required: false
 translatable: false
 default_value: {  }
diff --git a/services/drupal/config/sync/field.field.node.news_release.field_publish_date.yml b/services/drupal/config/sync/field.field.node.news_release.field_publish_date.yml
index b764bb0f45..1b7f151cd4 100644
--- a/services/drupal/config/sync/field.field.node.news_release.field_publish_date.yml
+++ b/services/drupal/config/sync/field.field.node.news_release.field_publish_date.yml
@@ -17,7 +17,7 @@ field_name: field_publish_date
 entity_type: node
 bundle: news_release
 label: 'Publish Date'
-description: 'Publication will occur within 15 minutes of the time you select. If you need exact timing, manually publish this content.'
+description: 'Publication will occur within 15 minutes of the time you select. If you need exact timing, manually publish this content. Note that this revision must be in the "Draft, approved" state in order to be automatically published at the selected time.'
 required: false
 translatable: false
 default_value: {  }
diff --git a/services/drupal/config/sync/field.field.node.page.field_publish_date.yml b/services/drupal/config/sync/field.field.node.page.field_publish_date.yml
index dbc64e6c16..a5c3e78a9a 100644
--- a/services/drupal/config/sync/field.field.node.page.field_publish_date.yml
+++ b/services/drupal/config/sync/field.field.node.page.field_publish_date.yml
@@ -17,7 +17,7 @@ field_name: field_publish_date
 entity_type: node
 bundle: page
 label: 'Publish Date'
-description: 'Publication will occur within 15 minutes of the time you select. If you need exact timing, manually publish this content.'
+description: 'Publication will occur within 15 minutes of the time you select. If you need exact timing, manually publish this content. Note that this revision must be in the "Draft, approved" state in order to be automatically published at the selected time.'
 required: false
 translatable: false
 default_value: {  }
diff --git a/services/drupal/config/sync/field.field.node.perspective.field_publish_date.yml b/services/drupal/config/sync/field.field.node.perspective.field_publish_date.yml
index 9115febdfe..d686df3a5d 100644
--- a/services/drupal/config/sync/field.field.node.perspective.field_publish_date.yml
+++ b/services/drupal/config/sync/field.field.node.perspective.field_publish_date.yml
@@ -17,7 +17,7 @@ field_name: field_publish_date
 entity_type: node
 bundle: perspective
 label: 'Publish Date'
-description: ''
+description: 'Publication will occur within 15 minutes of the time you select. If you need exact timing, manually publish this content. Note that this revision must be in the "Draft, approved" state in order to be automatically published at the selected time.'
 required: false
 translatable: true
 default_value: {  }
diff --git a/services/drupal/config/sync/field.field.node.public_notice.field_publish_date.yml b/services/drupal/config/sync/field.field.node.public_notice.field_publish_date.yml
index 2f32151efa..a84737f5fc 100644
--- a/services/drupal/config/sync/field.field.node.public_notice.field_publish_date.yml
+++ b/services/drupal/config/sync/field.field.node.public_notice.field_publish_date.yml
@@ -17,7 +17,7 @@ field_name: field_publish_date
 entity_type: node
 bundle: public_notice
 label: 'Publish Date'
-description: 'Publication will occur within 15 minutes of the time you select. If you need exact timing, manually publish this content.'
+description: 'Publication will occur within 15 minutes of the time you select. If you need exact timing, manually publish this content. Note that this revision must be in the "Draft, approved" state in order to be automatically published at the selected time.'
 required: false
 translatable: false
 default_value: {  }
diff --git a/services/drupal/config/sync/field.field.node.regulation.field_publish_date.yml b/services/drupal/config/sync/field.field.node.regulation.field_publish_date.yml
index 455bed2a98..056d65e01c 100644
--- a/services/drupal/config/sync/field.field.node.regulation.field_publish_date.yml
+++ b/services/drupal/config/sync/field.field.node.regulation.field_publish_date.yml
@@ -17,7 +17,7 @@ field_name: field_publish_date
 entity_type: node
 bundle: regulation
 label: 'Publish Date'
-description: 'Publication will occur within 15 minutes of the time you select. If you need exact timing, manually publish this content.'
+description: 'Publication will occur within 15 minutes of the time you select. If you need exact timing, manually publish this content. Note that this revision must be in the "Draft, approved" state in order to be automatically published at the selected time.'
 required: false
 translatable: false
 default_value: {  }
diff --git a/services/drupal/config/sync/field.field.node.web_area.field_publish_date.yml b/services/drupal/config/sync/field.field.node.web_area.field_publish_date.yml
index d6c1f7a1a4..1c0fc78799 100644
--- a/services/drupal/config/sync/field.field.node.web_area.field_publish_date.yml
+++ b/services/drupal/config/sync/field.field.node.web_area.field_publish_date.yml
@@ -17,7 +17,7 @@ field_name: field_publish_date
 entity_type: node
 bundle: web_area
 label: 'Publish Date'
-description: 'Publication will occur within 15 minutes of the time you select. If you need exact timing, manually publish this content.'
+description: 'Publication will occur within 15 minutes of the time you select. If you need exact timing, manually publish this content. Note that this revision must be in the "Draft, approved" state in order to be automatically published at the selected time.'
 required: false
 translatable: false
 default_value: {  }
diff --git a/services/drupal/config/sync/field.field.node.webform.field_publish_date.yml b/services/drupal/config/sync/field.field.node.webform.field_publish_date.yml
index bed4bf60ec..6146828a34 100644
--- a/services/drupal/config/sync/field.field.node.webform.field_publish_date.yml
+++ b/services/drupal/config/sync/field.field.node.webform.field_publish_date.yml
@@ -17,7 +17,7 @@ field_name: field_publish_date
 entity_type: node
 bundle: webform
 label: 'Publish Date'
-description: 'Publication will occur within 15 minutes of the time you select. If you need exact timing, manually publish this content.'
+description: 'Publication will occur within 15 minutes of the time you select. If you need exact timing, manually publish this content. Note that this revision must be in the "Draft, approved" state in order to be automatically published at the selected time.'
 required: false
 translatable: true
 default_value: {  }

From 93be745cda8132d1343e97b57e0138cf5f06beb0 Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Fri, 14 Jan 2022 10:18:14 -0800
Subject: [PATCH 71/87] [EPAD8-1579] Create form alter to update help text

---
 .../custom/epa_workflow/epa_workflow.module   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
index d23ef6b7db..8bd2e6ba03 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
@@ -294,6 +294,26 @@ function epa_workflow_form_node_form_alter(&$form, FormStateInterface $form_stat
       $markup = t("<strong>Note:</strong> The revision you are editing is not the currently published content. It may include edits that are not visible on the published page. Refer to the <a target='_blank' href='@url'>revision page</a> to see other revisions and revert if necessary.", ['@url' => $url]);
       \Drupal::messenger()->addWarning($markup);
     }
+
+    // If editing latest revision and has a Publish Date set.
+    if ($node->getRevisionId() == $current->getRevisionId() && isset($form['field_publish_date']['widget'][0]['value']['#default_value'])) {
+      $moderation_state = $form['moderation_state']['widget'][0]['current']['#markup'];
+      $date = $form['field_publish_date']['widget'][0]['value']['#default_value']->format('F d, Y');
+      $time = $form['field_publish_date']['widget'][0]['value']['#default_value']->format('h:i a');
+      // Is in the “Draft, approved” state.
+      if ($moderation_state == 'Draft, approved') {
+        $form['field_publish_date']['widget'][0]['#description'] = 'The revision will publish on ' . $date . ' at ' . $time . '.';
+      }
+      // Is in any other draft state.
+      else if ($moderation_state == 'Draft' || $moderation_state == 'Draft, needs review') {
+        $form['field_publish_date']['widget'][0]['#description'] = 'The revision is scheduled to publish on ' . $date . ' at ' . $time . ', but will only do so if this draft is approved. Currently, the draft is NOT approved.';
+      }
+
+      // If the current revision is published and has a Sunset Date set, update Sunset Date help text.
+      if ($form['status']['widget']['value']['#title'] == 'Published' && isset($form['field_expiration_date']['widget'][0]['value']['#default_value'])) {
+        $form['field_expiration_date']['widget'][0]['#description'] = 'This content will automatically sunset, and be unpublished, on ' . $date . ' at ' . $time . '.';
+      }
+    }
   }
 }
 

From 3c1ef8d64f7de6da43a69ac969fbab749a728de3 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Fri, 14 Jan 2022 14:13:40 -0500
Subject: [PATCH 72/87] EPAD8-298 add entity browser and configure views to
 allow finding paragraphs by author

---
 services/drupal/composer.json                 |   1 +
 services/drupal/composer.lock                 |  92 +-
 ...display.paragraph.from_library.default.yml |  18 +-
 .../drupal/config/sync/core.extension.yml     |   1 +
 ...owser.browser.paragraphs_library_items.yml |  33 +
 .../config/sync/language/es/user.mail.yml     |   1 +
 .../es/views.view.paragraphs_library.yml      |   3 -
 .../views.view.paragraphs_library_browser.yml |  50 ++
 .../sync/views.view.paragraphs_library.yml    | 164 +++-
 .../views.view.paragraphs_library_browser.yml | 801 ++++++++++++++++++
 10 files changed, 1124 insertions(+), 40 deletions(-)
 create mode 100644 services/drupal/config/sync/entity_browser.browser.paragraphs_library_items.yml
 create mode 100644 services/drupal/config/sync/language/es/views.view.paragraphs_library_browser.yml
 create mode 100644 services/drupal/config/sync/views.view.paragraphs_library_browser.yml

diff --git a/services/drupal/composer.json b/services/drupal/composer.json
index 515142bfaa..75f82ec484 100644
--- a/services/drupal/composer.json
+++ b/services/drupal/composer.json
@@ -222,6 +222,7 @@
         "drupal/editor_advanced_link": "^1.8",
         "drupal/elasticsearch_connector": "^7.0-alpha3",
         "drupal/embed": "^1.4",
+        "drupal/entity_browser": "^2.6",
         "drupal/entity_clone": "^1.0@beta",
         "drupal/entity_usage": "^2.0-beta3",
         "drupal/entitygroupfield": "^1.0@alpha",
diff --git a/services/drupal/composer.lock b/services/drupal/composer.lock
index 28ddec3469..5542ebe762 100644
--- a/services/drupal/composer.lock
+++ b/services/drupal/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e90e0bd14cd6e73cd50b6e460238b9fe",
+    "content-hash": "02af06a01ba5bea76926a0a79bd22bef",
     "packages": [
         {
             "name": "akamai-open/edgegrid-auth",
@@ -4562,6 +4562,96 @@
                 "source": "https://git.drupalcode.org/project/entity"
             }
         },
+        {
+            "name": "drupal/entity_browser",
+            "version": "2.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/entity_browser.git",
+                "reference": "8.x-2.6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/entity_browser-8.x-2.6.zip",
+                "reference": "8.x-2.6",
+                "shasum": "95cad4ce9620ccb4f02afa0e8b8bbf7c73fc5aac"
+            },
+            "require": {
+                "drupal/core": "^8.8 || ^9"
+            },
+            "require-dev": {
+                "drupal/embed": "~1.0",
+                "drupal/entity_embed": "1.x-dev",
+                "drupal/entity_reference_revisions": "1.x-dev",
+                "drupal/entityqueue": "1.x-dev",
+                "drupal/inline_entity_form": "1.x-dev",
+                "drupal/paragraphs": "1.x-dev",
+                "drupal/token": "~1.0"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "8.x-2.6",
+                    "datestamp": "1624401306",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Janez Urevc",
+                    "homepage": "https://github.com/slashrsm",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Primoz Hmeljak",
+                    "homepage": "https://github.com/primsi",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "See other contributors",
+                    "homepage": "https://www.drupal.org/node/1943336/committers",
+                    "role": "contributor"
+                },
+                {
+                    "name": "Drupal Media Team",
+                    "homepage": "https://www.drupal.org/user/3260690"
+                },
+                {
+                    "name": "Primsi",
+                    "homepage": "https://www.drupal.org/user/282629"
+                },
+                {
+                    "name": "marcingy",
+                    "homepage": "https://www.drupal.org/user/77320"
+                },
+                {
+                    "name": "oknate",
+                    "homepage": "https://www.drupal.org/user/471638"
+                },
+                {
+                    "name": "samuel.mortenson",
+                    "homepage": "https://www.drupal.org/user/2582268"
+                },
+                {
+                    "name": "slashrsm",
+                    "homepage": "https://www.drupal.org/user/744628"
+                }
+            ],
+            "description": "Entity browsing and selecting component.",
+            "homepage": "http://drupal.org/project/entity_browser",
+            "support": {
+                "source": "https://git.drupalcode.org/project/entity_browser",
+                "issues": "https://www.drupal.org/project/issues/entity_browser",
+                "irc": "irc://irc.freenode.org/drupal-contribute"
+            }
+        },
         {
             "name": "drupal/entity_clone",
             "version": "1.0.0-beta6",
diff --git a/services/drupal/config/sync/core.entity_form_display.paragraph.from_library.default.yml b/services/drupal/config/sync/core.entity_form_display.paragraph.from_library.default.yml
index d2d9ab7317..9524b8da2a 100644
--- a/services/drupal/config/sync/core.entity_form_display.paragraph.from_library.default.yml
+++ b/services/drupal/config/sync/core.entity_form_display.paragraph.from_library.default.yml
@@ -3,8 +3,11 @@ langcode: en
 status: true
 dependencies:
   config:
+    - entity_browser.browser.paragraphs_library_items
     - field.field.paragraph.from_library.field_reusable_paragraph
     - paragraphs.paragraphs_type.from_library
+  module:
+    - entity_browser
 _core:
   default_config_hash: r4TZydyh5ONZnEbmIQMgY2PeiciP9cSAwBGrDLmxvd8
 id: paragraph.from_library.default
@@ -15,12 +18,17 @@ content:
   field_reusable_paragraph:
     weight: 0
     settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-      match_limit: 10
+      entity_browser: paragraphs_library_items
+      field_widget_display: rendered_entity
+      field_widget_display_settings:
+        view_mode: default
+      field_widget_edit: true
+      field_widget_remove: true
+      open: true
+      selection_mode: selection_append
+      field_widget_replace: false
     third_party_settings: {  }
-    type: entity_reference_autocomplete
+    type: entity_browser_entity_reference
     region: content
 hidden:
   created: true
diff --git a/services/drupal/config/sync/core.extension.yml b/services/drupal/config/sync/core.extension.yml
index 1aa018eba2..e15281d565 100644
--- a/services/drupal/config/sync/core.extension.yml
+++ b/services/drupal/config/sync/core.extension.yml
@@ -46,6 +46,7 @@ module:
   elasticsearch_connector: 0
   embed: 0
   entity: 0
+  entity_browser: 0
   entity_clone: 0
   entity_embed: 0
   entity_reference_revisions: 0
diff --git a/services/drupal/config/sync/entity_browser.browser.paragraphs_library_items.yml b/services/drupal/config/sync/entity_browser.browser.paragraphs_library_items.yml
new file mode 100644
index 0000000000..ffaafa0024
--- /dev/null
+++ b/services/drupal/config/sync/entity_browser.browser.paragraphs_library_items.yml
@@ -0,0 +1,33 @@
+uuid: c5797686-1cff-420b-b580-2da66c90b5ff
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.paragraphs_library_browser
+  module:
+    - views
+_core:
+  default_config_hash: hL10O_U8EaCNhab9aVtHZVC9bUAvPGeOQOVh9K1yyls
+name: paragraphs_library_items
+label: 'Paragraphs library items'
+display: modal
+display_configuration:
+  width: ''
+  height: ''
+  link_text: 'Select reusable paragraph'
+  auto_open: false
+selection_display: no_display
+selection_display_configuration: {  }
+widget_selector: single
+widget_selector_configuration: {  }
+widgets:
+  19e5e98c-307e-437a-b850-0fab163d7fec:
+    settings:
+      view: paragraphs_library_browser
+      view_display: entity_browser
+      submit_text: 'Select reusable paragraph'
+      auto_select: false
+    uuid: 19e5e98c-307e-437a-b850-0fab163d7fec
+    weight: 1
+    label: 'Available library items'
+    id: view
diff --git a/services/drupal/config/sync/language/es/user.mail.yml b/services/drupal/config/sync/language/es/user.mail.yml
index 6f3bdf3af7..5e4709977a 100644
--- a/services/drupal/config/sync/language/es/user.mail.yml
+++ b/services/drupal/config/sync/language/es/user.mail.yml
@@ -1,4 +1,5 @@
 cancel_confirm:
+  body: "[user:display-name],\r\n\r\nA request to cancel your account has been made at [site:name].\r\n\r\nYou may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:cancel-url]\r\n\r\nNOTE: The cancellation of your account is not reversible.\r\n\r\nThis link expires in one day and nothing will happen if it is not used.\r\n\r\n--  [site:name] team"
   subject: 'Solicitud de cancelación de cuenta para [user:display-name] en [site:name]'
 password_reset:
   body: "[user:display-name],\r\n\r\nUna petición para reestablecer la contraseña de su cuenta ha sido realizada en [site:name].\r\n\r\nAhora puede iniciar sesión haciendo clic en este enlace o copiándolo y pegándolo en su navegador:\r\n\r\n[user:one-time-login-url]\r\n\r\nEste enlace solo puede ser usado una vez para iniciar sesión y le llevará a una página donde puede establecer su contraseña. Caduca después de un día y nada ocurrirá si no se usa.\r\n\r\n--  El equipo de [site:name]"
diff --git a/services/drupal/config/sync/language/es/views.view.paragraphs_library.yml b/services/drupal/config/sync/language/es/views.view.paragraphs_library.yml
index b6a121897c..689cddaf76 100644
--- a/services/drupal/config/sync/language/es/views.view.paragraphs_library.yml
+++ b/services/drupal/config/sync/language/es/views.view.paragraphs_library.yml
@@ -29,9 +29,6 @@ display:
         paragraphs__target_id:
           label: Parráfos
           separator: ', '
-        langcode:
-          label: Idioma
-          separator: ', '
         id:
           label: ID
           separator: ', '
diff --git a/services/drupal/config/sync/language/es/views.view.paragraphs_library_browser.yml b/services/drupal/config/sync/language/es/views.view.paragraphs_library_browser.yml
new file mode 100644
index 0000000000..24c1be9cf1
--- /dev/null
+++ b/services/drupal/config/sync/language/es/views.view.paragraphs_library_browser.yml
@@ -0,0 +1,50 @@
+display:
+  default:
+    display_title: Máster
+    display_options:
+      exposed_form:
+        options:
+          submit_button: Filtro
+          reset_button_label: Restablecer
+          exposed_sorts_label: 'Ordenar por'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        options:
+          expose:
+            items_per_page_label: 'Elementos por página'
+            items_per_page_options_all_label: '- Todo -'
+            offset_label: Desplazamiento
+          tags:
+            previous: ‹‹
+            next: ››
+      fields:
+        entity_browser_select:
+          label: Seleccionar
+        label:
+          label: Etiqueta
+          separator: ', '
+        type:
+          label: Tipo
+          separator: ', '
+        paragraphs__target_id:
+          label: Parráfos
+          separator: ', '
+        changed:
+          label: Modificado
+          separator: ', '
+      filters:
+        label:
+          expose:
+            label: Etiqueta
+          group_info:
+            label: Etiqueta
+        type:
+          expose:
+            label: Tipo
+      title: 'Biblioteca de Paragraphs'
+      empty:
+        area_text_custom:
+          content: 'No hay artículos de la biblioteca disponibles.'
+  entity_browser:
+    display_title: 'Navegador de entidades'
diff --git a/services/drupal/config/sync/views.view.paragraphs_library.yml b/services/drupal/config/sync/views.view.paragraphs_library.yml
index 4ddcc68188..db607f2d4b 100644
--- a/services/drupal/config/sync/views.view.paragraphs_library.yml
+++ b/services/drupal/config/sync/views.view.paragraphs_library.yml
@@ -7,6 +7,7 @@ dependencies:
     - paragraphs
     - paragraphs_library
     - user
+    - views_autocomplete_filters
 _core:
   default_config_hash: 67G2lyvlXJE8P8b1oAheELEdM5i74aipXfDIZCpAsdQ
 id: paragraphs_library
@@ -42,7 +43,7 @@ display:
         type: basic
         options:
           submit_button: Filter
-          reset_button: false
+          reset_button: true
           reset_button_label: Reset
           exposed_sorts_label: 'Sort by'
           expose_sort_order: true
@@ -80,18 +81,35 @@ display:
           columns:
             label: label
             type: type
+            uid: uid
+            paragraphs__target_id: paragraphs__target_id
             id: id
             count: count
+            changed: changed
             operations: operations
           info:
             label:
-              sortable: false
+              sortable: true
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
             type:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            uid:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            paragraphs__target_id:
               sortable: false
               default_sort_order: asc
               align: ''
@@ -106,12 +124,19 @@ display:
               empty_column: false
               responsive: ''
             count:
-              sortable: false
+              sortable: true
               default_sort_order: asc
               align: views-align-right
               separator: ''
               empty_column: false
               responsive: ''
+            changed:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
             operations:
               align: ''
               separator: ''
@@ -252,14 +277,14 @@ display:
           entity_type: paragraph
           entity_field: type
           plugin_id: field
-        paragraphs__target_id:
-          id: paragraphs__target_id
+        uid:
+          id: uid
           table: paragraphs_library_item_field_data
-          field: paragraphs__target_id
+          field: uid
           relationship: none
           group_type: group
           admin_label: ''
-          label: Paragraphs
+          label: Author
           exclude: false
           alter:
             alter_text: false
@@ -301,12 +326,11 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: target_id
-          type: paragraph_summary
-          settings: {  }
-          group_column: entity_id
-          group_columns:
-            target_id: target_id
-            target_revision_id: target_revision_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
           group_rows: true
           delta_limit: 0
           delta_offset: 0
@@ -316,16 +340,16 @@ display:
           separator: ', '
           field_api_classes: false
           entity_type: paragraphs_library_item
-          entity_field: paragraphs
+          entity_field: uid
           plugin_id: field
-        langcode:
-          id: langcode
+        paragraphs__target_id:
+          id: paragraphs__target_id
           table: paragraphs_library_item_field_data
-          field: langcode
+          field: paragraphs__target_id
           relationship: none
           group_type: group
           admin_label: ''
-          label: Language
+          label: Paragraphs
           exclude: false
           alter:
             alter_text: false
@@ -366,13 +390,13 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          click_sort_column: value
-          type: language
-          settings:
-            link_to_entity: false
-            native_language: false
-          group_column: value
-          group_columns: {  }
+          click_sort_column: target_id
+          type: paragraph_summary
+          settings: {  }
+          group_column: entity_id
+          group_columns:
+            target_id: target_id
+            target_revision_id: target_revision_id
           group_rows: true
           delta_limit: 0
           delta_offset: 0
@@ -382,7 +406,7 @@ display:
           separator: ', '
           field_api_classes: false
           entity_type: paragraphs_library_item
-          entity_field: langcode
+          entity_field: paragraphs
           plugin_id: field
         id:
           id: id
@@ -561,7 +585,7 @@ display:
             date_format: short
             custom_date_format: ''
             timezone: ''
-          group_column: entity_id
+          group_column: value
           group_columns: {  }
           group_rows: true
           delta_limit: 0
@@ -794,7 +818,83 @@ display:
           entity_type: paragraph
           entity_field: default_langcode
           plugin_id: boolean
-      sorts: {  }
+        uid:
+          id: uid
+          table: paragraphs_library_item_field_data
+          field: uid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: uid_op
+            label: Author
+            description: ''
+            use_operator: false
+            operator: uid_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: uid
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              layout_editor: '0'
+              alerts_manager: '0'
+              block_manager: '0'
+              system_editor: '0'
+              system_webmaster: '0'
+              menu_admin: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: false
+          handler: 'default:user'
+          handler_settings:
+            include_anonymous: false
+            filter:
+              type: _none
+            target_bundles: null
+            sort:
+              field: login
+              direction: DESC
+            auto_create: false
+          widget: autocomplete
+          entity_type: paragraphs_library_item
+          entity_field: uid
+          plugin_id: entity_reference
+      sorts:
+        changed:
+          id: changed
+          table: paragraphs_library_item_field_data
+          field: changed
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: DESC
+          exposed: false
+          expose:
+            label: ''
+          granularity: second
+          entity_type: paragraphs_library_item
+          entity_field: changed
+          plugin_id: date
       title: 'Paragraphs library'
       header: {  }
       footer: {  }
@@ -840,7 +940,7 @@ display:
           1: AND
       group_by: true
     cache_metadata:
-      max-age: 0
+      max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
@@ -854,10 +954,12 @@ display:
     display_title: Page
     position: 1
     display_options:
-      display_extenders: {  }
+      display_extenders:
+        views_ajax_get:
+          ajax_get: false
       path: admin/content/paragraphs
     cache_metadata:
-      max-age: 0
+      max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
diff --git a/services/drupal/config/sync/views.view.paragraphs_library_browser.yml b/services/drupal/config/sync/views.view.paragraphs_library_browser.yml
new file mode 100644
index 0000000000..ecfa17c6ca
--- /dev/null
+++ b/services/drupal/config/sync/views.view.paragraphs_library_browser.yml
@@ -0,0 +1,801 @@
+uuid: 09d9194d-1ecb-411d-854e-31e2c10128b7
+langcode: en
+status: true
+dependencies:
+  module:
+    - entity_browser
+    - paragraphs
+    - paragraphs_library
+    - views_autocomplete_filters
+_core:
+  default_config_hash: 1JRFcz5C2u0_XbanN1ZK55S1KDMAwDhJuIVhtw6m7XY
+id: paragraphs_library_browser
+label: 'Paragraphs library browser'
+module: views
+description: ''
+tag: ''
+base_table: paragraphs_library_item_field_data
+base_field: id
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: none
+        options: {  }
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Filter
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: ‹‹
+            next: ››
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            entity_browser_select: entity_browser_select
+            label: label
+            type: type
+            uid: uid
+            paragraphs__target_id: paragraphs__target_id
+            changed: changed
+          info:
+            entity_browser_select:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            label:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            type:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            uid:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            paragraphs__target_id:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            changed:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          default: changed
+          empty_table: true
+      row:
+        type: fields
+      fields:
+        entity_browser_select:
+          id: entity_browser_select
+          table: paragraphs_library_item
+          field: entity_browser_select
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Select
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          use_field_cardinality: true
+          entity_type: paragraphs_library_item
+          plugin_id: entity_browser_select
+        label:
+          id: label
+          table: paragraphs_library_item_field_data
+          field: label
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Label
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: paragraphs_library_item
+          entity_field: label
+          plugin_id: field
+        type:
+          id: type
+          table: paragraphs_item_field_data
+          field: type
+          relationship: paragraphs__target_id
+          group_type: group
+          admin_label: ''
+          label: Type
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: paragraph
+          entity_field: type
+          plugin_id: field
+        uid:
+          id: uid
+          table: paragraphs_library_item_field_data
+          field: uid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Author
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: false
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: paragraphs_library_item
+          entity_field: uid
+          plugin_id: field
+        paragraphs__target_id:
+          id: paragraphs__target_id
+          table: paragraphs_library_item_field_data
+          field: paragraphs__target_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Paragraphs
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: paragraph_summary
+          settings: {  }
+          group_column: entity_id
+          group_columns:
+            target_id: target_id
+            target_revision_id: target_revision_id
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: paragraphs_library_item
+          entity_field: paragraphs
+          plugin_id: field
+        changed:
+          id: changed
+          table: paragraphs_library_item_field_data
+          field: changed
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Changed
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: timestamp
+          settings:
+            date_format: medium
+            custom_date_format: ''
+            timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: paragraphs_library_item
+          entity_field: changed
+          plugin_id: field
+      filters:
+        label:
+          id: label
+          table: paragraphs_library_item_field_data
+          field: label
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: label_op
+            label: Label
+            description: ''
+            use_operator: false
+            operator: label_op
+            identifier: label
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            operator_limit_selection: false
+            operator_list: {  }
+          is_grouped: false
+          group_info:
+            label: Label
+            description: null
+            identifier: label
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items:
+              1: {  }
+              2: {  }
+              3: {  }
+          entity_type: paragraphs_library_item
+          entity_field: label
+          plugin_id: string
+        type:
+          id: type
+          table: paragraphs_item_field_data
+          field: type
+          relationship: paragraphs__target_id
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: type_op
+            label: Type
+            description: ''
+            use_operator: false
+            operator: type_op
+            identifier: type
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+            operator_limit_selection: false
+            operator_list: {  }
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: paragraph
+          entity_field: type
+          plugin_id: bundle
+        default_langcode:
+          id: default_langcode
+          table: paragraphs_library_item_field_data
+          field: default_langcode
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: '1'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            operator_limit_selection: false
+            operator_list: {  }
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: paragraphs_library_item
+          entity_field: default_langcode
+          plugin_id: boolean
+        default_langcode_1:
+          id: default_langcode_1
+          table: paragraphs_item_field_data
+          field: default_langcode
+          relationship: paragraphs__target_id
+          group_type: group
+          admin_label: ''
+          operator: '='
+          value: '1'
+          group: 1
+          exposed: false
+          expose:
+            operator_id: ''
+            label: ''
+            description: ''
+            use_operator: false
+            operator: ''
+            identifier: ''
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+            operator_limit_selection: false
+            operator_list: {  }
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: paragraph
+          entity_field: default_langcode
+          plugin_id: boolean
+        uid:
+          id: uid
+          table: paragraphs_library_item_field_data
+          field: uid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: uid_op
+            label: Author
+            description: ''
+            use_operator: false
+            operator: uid_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: uid
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              layout_editor: '0'
+              alerts_manager: '0'
+              block_manager: '0'
+              system_editor: '0'
+              system_webmaster: '0'
+              menu_admin: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: false
+          handler: 'default:user'
+          handler_settings:
+            include_anonymous: false
+            filter:
+              type: _none
+            target_bundles: null
+            sort:
+              field: login
+              direction: DESC
+            auto_create: false
+          widget: autocomplete
+          entity_type: paragraphs_library_item
+          entity_field: uid
+          plugin_id: entity_reference
+      sorts: {  }
+      title: 'Paragraphs library'
+      header: {  }
+      footer: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content: 'No library items available.'
+          plugin_id: text_custom
+      relationships:
+        paragraphs__target_id:
+          id: paragraphs__target_id
+          table: paragraphs_library_item_field_data
+          field: paragraphs__target_id
+          relationship: none
+          group_type: group
+          admin_label: Paragraphs
+          required: true
+          entity_type: paragraphs_library_item
+          entity_field: paragraphs
+          plugin_id: standard
+      arguments: {  }
+      display_extenders:
+        views_ajax_get:
+          ajax_get: false
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      group_by: false
+      use_ajax: true
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+      tags: {  }
+  entity_browser:
+    display_plugin: entity_browser
+    id: entity_browser
+    display_title: 'Entity browser'
+    position: 2
+    display_options:
+      display_extenders: {  }
+      rendering_language: '***LANGUAGE_language_interface***'
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+      tags: {  }

From 35abc79e2b5bcc11c28613a1aa533efb2b053247 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Fri, 14 Jan 2022 15:21:44 -0500
Subject: [PATCH 73/87] EPAD8-298 add group field to paragraph library and
 allow filtering on it

---
 ...y_item.paragraphs_library_item.default.yml |  67 ++++++++
 ...y_item.paragraphs_library_item.default.yml |  42 +++++
 ...y_item.paragraphs_library_item.summary.yml |   2 +
 ...aragraphs_library_item.field_web_areas.yml |  35 +++++
 ...aragraphs_library_item.field_web_areas.yml |  20 +++
 .../sync/views.view.paragraphs_library.yml    | 143 ++++++++++++++++--
 .../views.view.paragraphs_library_browser.yml | 122 ++++++++++++++-
 7 files changed, 413 insertions(+), 18 deletions(-)
 create mode 100644 services/drupal/config/sync/core.entity_form_display.paragraphs_library_item.paragraphs_library_item.default.yml
 create mode 100644 services/drupal/config/sync/core.entity_view_display.paragraphs_library_item.paragraphs_library_item.default.yml
 create mode 100644 services/drupal/config/sync/field.field.paragraphs_library_item.paragraphs_library_item.field_web_areas.yml
 create mode 100644 services/drupal/config/sync/field.storage.paragraphs_library_item.field_web_areas.yml

diff --git a/services/drupal/config/sync/core.entity_form_display.paragraphs_library_item.paragraphs_library_item.default.yml b/services/drupal/config/sync/core.entity_form_display.paragraphs_library_item.paragraphs_library_item.default.yml
new file mode 100644
index 0000000000..6f416af603
--- /dev/null
+++ b/services/drupal/config/sync/core.entity_form_display.paragraphs_library_item.paragraphs_library_item.default.yml
@@ -0,0 +1,67 @@
+uuid: 9fab40ff-3eb3-4de1-a4c0-ded6f394e12a
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraphs_library_item.paragraphs_library_item.field_web_areas
+  module:
+    - paragraphs
+    - paragraphs_library
+id: paragraphs_library_item.paragraphs_library_item.default
+targetEntityType: paragraphs_library_item
+bundle: paragraphs_library_item
+mode: default
+content:
+  field_web_areas:
+    weight: 26
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+    type: entity_reference_autocomplete
+    region: content
+  label:
+    type: string_textfield
+    weight: -5
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  langcode:
+    type: language_select
+    weight: 2
+    region: content
+    settings:
+      include_locked: true
+    third_party_settings: {  }
+  paragraphs:
+    type: paragraphs
+    weight: 0
+    region: content
+    settings:
+      title: Paragraph
+      title_plural: Paragraphs
+      edit_mode: open
+      closed_mode: summary
+      autocollapse: none
+      closed_mode_threshold: 0
+      add_mode: dropdown
+      form_display_mode: default
+      default_paragraph_type: ''
+      features:
+        collapse_edit_all: collapse_edit_all
+        duplicate: duplicate
+    third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 3
+    region: content
+    third_party_settings: {  }
+hidden:
+  created: true
+  uid: true
diff --git a/services/drupal/config/sync/core.entity_view_display.paragraphs_library_item.paragraphs_library_item.default.yml b/services/drupal/config/sync/core.entity_view_display.paragraphs_library_item.paragraphs_library_item.default.yml
new file mode 100644
index 0000000000..28c5a178fe
--- /dev/null
+++ b/services/drupal/config/sync/core.entity_view_display.paragraphs_library_item.paragraphs_library_item.default.yml
@@ -0,0 +1,42 @@
+uuid: 9c3d9f57-fac1-46db-89de-102013628ef5
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraphs_library_item.paragraphs_library_item.field_web_areas
+  module:
+    - entity_reference_revisions
+    - paragraphs_library
+id: paragraphs_library_item.paragraphs_library_item.default
+targetEntityType: paragraphs_library_item
+bundle: paragraphs_library_item
+mode: default
+content:
+  field_web_areas:
+    weight: 1
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    type: entity_reference_label
+    region: content
+  label:
+    type: string
+    weight: 0
+    label: hidden
+    region: content
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+  paragraphs:
+    label: hidden
+    type: entity_reference_revisions_entity_view
+    weight: 0
+    region: content
+    settings:
+      view_mode: default
+      link: ''
+    third_party_settings: {  }
+hidden:
+  langcode: true
+  search_api_excerpt: true
diff --git a/services/drupal/config/sync/core.entity_view_display.paragraphs_library_item.paragraphs_library_item.summary.yml b/services/drupal/config/sync/core.entity_view_display.paragraphs_library_item.paragraphs_library_item.summary.yml
index 72d5519f47..d50a63c328 100644
--- a/services/drupal/config/sync/core.entity_view_display.paragraphs_library_item.paragraphs_library_item.summary.yml
+++ b/services/drupal/config/sync/core.entity_view_display.paragraphs_library_item.paragraphs_library_item.summary.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.paragraphs_library_item.summary
+    - field.field.paragraphs_library_item.paragraphs_library_item.field_web_areas
   module:
     - paragraphs
     - paragraphs_library
@@ -31,5 +32,6 @@ content:
     third_party_settings: {  }
 hidden:
   content_moderation_control: true
+  field_web_areas: true
   langcode: true
   search_api_excerpt: true
diff --git a/services/drupal/config/sync/field.field.paragraphs_library_item.paragraphs_library_item.field_web_areas.yml b/services/drupal/config/sync/field.field.paragraphs_library_item.paragraphs_library_item.field_web_areas.yml
new file mode 100644
index 0000000000..2b256a2189
--- /dev/null
+++ b/services/drupal/config/sync/field.field.paragraphs_library_item.paragraphs_library_item.field_web_areas.yml
@@ -0,0 +1,35 @@
+uuid: c35b68b9-a15b-4228-8757-d870bb148c38
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraphs_library_item.field_web_areas
+    - group.type.web_area
+  module:
+    - custom_add_another
+    - paragraphs_library
+third_party_settings:
+  custom_add_another:
+    custom_add_another: ''
+    custom_remove: ''
+id: paragraphs_library_item.paragraphs_library_item.field_web_areas
+field_name: field_web_areas
+entity_type: paragraphs_library_item
+bundle: paragraphs_library_item
+label: 'Web Areas'
+description: 'Optionally identify Web Areas that are likely to use this paragraph. This is only to assist in finding paragraphs and has no affect on who can edit or use the paragraph.'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:group'
+  handler_settings:
+    target_bundles:
+      web_area: web_area
+    sort:
+      field: _none
+      direction: ASC
+    auto_create: false
+    auto_create_bundle: ''
+field_type: entity_reference
diff --git a/services/drupal/config/sync/field.storage.paragraphs_library_item.field_web_areas.yml b/services/drupal/config/sync/field.storage.paragraphs_library_item.field_web_areas.yml
new file mode 100644
index 0000000000..57bf71a87d
--- /dev/null
+++ b/services/drupal/config/sync/field.storage.paragraphs_library_item.field_web_areas.yml
@@ -0,0 +1,20 @@
+uuid: 50a13bd9-7b97-4707-b8bb-39a2351ad1fb
+langcode: en
+status: true
+dependencies:
+  module:
+    - group
+    - paragraphs_library
+id: paragraphs_library_item.field_web_areas
+field_name: field_web_areas
+entity_type: paragraphs_library_item
+type: entity_reference
+settings:
+  target_type: group
+module: core
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/services/drupal/config/sync/views.view.paragraphs_library.yml b/services/drupal/config/sync/views.view.paragraphs_library.yml
index db607f2d4b..c67887a797 100644
--- a/services/drupal/config/sync/views.view.paragraphs_library.yml
+++ b/services/drupal/config/sync/views.view.paragraphs_library.yml
@@ -2,6 +2,8 @@ uuid: 4eadb901-01bd-4473-8add-357c6961bb5c
 langcode: en
 status: true
 dependencies:
+  config:
+    - field.storage.paragraphs_library_item.field_web_areas
   module:
     - entity_usage
     - paragraphs
@@ -82,6 +84,7 @@ display:
             label: label
             type: type
             uid: uid
+            field_web_areas: field_web_areas
             paragraphs__target_id: paragraphs__target_id
             id: id
             count: count
@@ -109,6 +112,11 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
+            field_web_areas:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
             paragraphs__target_id:
               sortable: false
               default_sort_order: asc
@@ -132,7 +140,7 @@ display:
               responsive: ''
             changed:
               sortable: true
-              default_sort_order: asc
+              default_sort_order: desc
               align: ''
               separator: ''
               empty_column: false
@@ -142,7 +150,7 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
-          default: '-1'
+          default: changed
           empty_table: true
       row:
         type: fields
@@ -342,6 +350,69 @@ display:
           entity_type: paragraphs_library_item
           entity_field: uid
           plugin_id: field
+        field_web_areas:
+          id: field_web_areas
+          table: paragraphs_library_item__field_web_areas
+          field: field_web_areas
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Web Area(s)'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: entity_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
         paragraphs__target_id:
           id: paragraphs__target_id
           table: paragraphs_library_item_field_data
@@ -879,22 +950,58 @@ display:
           entity_type: paragraphs_library_item
           entity_field: uid
           plugin_id: entity_reference
-      sorts:
-        changed:
-          id: changed
-          table: paragraphs_library_item_field_data
-          field: changed
+        field_web_areas_target_id:
+          id: field_web_areas_target_id
+          table: paragraphs_library_item__field_web_areas
+          field: field_web_areas_target_id
           relationship: none
           group_type: group
           admin_label: ''
-          order: DESC
-          exposed: false
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
           expose:
+            operator_id: field_web_areas_target_id_op
+            label: 'Web Area(s)'
+            description: ''
+            use_operator: false
+            operator: field_web_areas_target_id_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: field_web_areas_target_id
+            required: false
+            remember: false
+            multiple: true
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              layout_editor: '0'
+              alerts_manager: '0'
+              block_manager: '0'
+              system_editor: '0'
+              system_webmaster: '0'
+              menu_admin: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
             label: ''
-          granularity: second
-          entity_type: paragraphs_library_item
-          entity_field: changed
-          plugin_id: date
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: false
+          handler: 'default:group'
+          handler_settings: {  }
+          widget: autocomplete
+          plugin_id: entity_reference
+      sorts: {  }
       title: 'Paragraphs library'
       header: {  }
       footer: {  }
@@ -933,7 +1040,9 @@ display:
           entity_type: paragraphs_library_item
           plugin_id: standard
       arguments: {  }
-      display_extenders: {  }
+      display_extenders:
+        views_ajax_get:
+          ajax_get: false
       filter_groups:
         operator: AND
         groups:
@@ -947,7 +1056,8 @@ display:
         - url
         - url.query_args
         - user.permissions
-      tags: {  }
+      tags:
+        - 'config:field.storage.paragraphs_library_item.field_web_areas'
   page_1:
     display_plugin: page
     id: page_1
@@ -966,4 +1076,5 @@ display:
         - url
         - url.query_args
         - user.permissions
-      tags: {  }
+      tags:
+        - 'config:field.storage.paragraphs_library_item.field_web_areas'
diff --git a/services/drupal/config/sync/views.view.paragraphs_library_browser.yml b/services/drupal/config/sync/views.view.paragraphs_library_browser.yml
index ecfa17c6ca..25f70d77e1 100644
--- a/services/drupal/config/sync/views.view.paragraphs_library_browser.yml
+++ b/services/drupal/config/sync/views.view.paragraphs_library_browser.yml
@@ -2,6 +2,8 @@ uuid: 09d9194d-1ecb-411d-854e-31e2c10128b7
 langcode: en
 status: true
 dependencies:
+  config:
+    - field.storage.paragraphs_library_item.field_web_areas
   module:
     - entity_browser
     - paragraphs
@@ -375,6 +377,69 @@ display:
           entity_type: paragraphs_library_item
           entity_field: uid
           plugin_id: field
+        field_web_areas:
+          id: field_web_areas
+          table: paragraphs_library_item__field_web_areas
+          field: field_web_areas
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: 'Web Area(s)'
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          plugin_id: field
         paragraphs__target_id:
           id: paragraphs__target_id
           table: paragraphs_library_item_field_data
@@ -738,6 +803,57 @@ display:
           entity_type: paragraphs_library_item
           entity_field: uid
           plugin_id: entity_reference
+        field_web_areas_target_id:
+          id: field_web_areas_target_id
+          table: paragraphs_library_item__field_web_areas
+          field: field_web_areas_target_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_web_areas_target_id_op
+            label: 'Web Area(s)'
+            description: ''
+            use_operator: false
+            operator: field_web_areas_target_id_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: field_web_areas_target_id
+            required: false
+            remember: false
+            multiple: true
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              layout_editor: '0'
+              alerts_manager: '0'
+              block_manager: '0'
+              system_editor: '0'
+              system_webmaster: '0'
+              menu_admin: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: false
+          handler: 'default:group'
+          handler_settings: {  }
+          widget: autocomplete
+          plugin_id: entity_reference
       sorts: {  }
       title: 'Paragraphs library'
       header: {  }
@@ -783,7 +899,8 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
-      tags: {  }
+      tags:
+        - 'config:field.storage.paragraphs_library_item.field_web_areas'
   entity_browser:
     display_plugin: entity_browser
     id: entity_browser
@@ -798,4 +915,5 @@ display:
         - 'languages:language_interface'
         - url
         - url.query_args
-      tags: {  }
+      tags:
+        - 'config:field.storage.paragraphs_library_item.field_web_areas'

From 541004a98344557ca0ab9360dc457fa7ce2f86ad Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Sun, 16 Jan 2022 20:40:16 -0800
Subject: [PATCH 74/87] [EPAD8-1579] Change to update revision page

---
 .../custom/epa_workflow/epa_workflow.module   | 52 ++++++++++++-------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
index 8bd2e6ba03..5d1d44b508 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
@@ -294,26 +294,6 @@ function epa_workflow_form_node_form_alter(&$form, FormStateInterface $form_stat
       $markup = t("<strong>Note:</strong> The revision you are editing is not the currently published content. It may include edits that are not visible on the published page. Refer to the <a target='_blank' href='@url'>revision page</a> to see other revisions and revert if necessary.", ['@url' => $url]);
       \Drupal::messenger()->addWarning($markup);
     }
-
-    // If editing latest revision and has a Publish Date set.
-    if ($node->getRevisionId() == $current->getRevisionId() && isset($form['field_publish_date']['widget'][0]['value']['#default_value'])) {
-      $moderation_state = $form['moderation_state']['widget'][0]['current']['#markup'];
-      $date = $form['field_publish_date']['widget'][0]['value']['#default_value']->format('F d, Y');
-      $time = $form['field_publish_date']['widget'][0]['value']['#default_value']->format('h:i a');
-      // Is in the “Draft, approved” state.
-      if ($moderation_state == 'Draft, approved') {
-        $form['field_publish_date']['widget'][0]['#description'] = 'The revision will publish on ' . $date . ' at ' . $time . '.';
-      }
-      // Is in any other draft state.
-      else if ($moderation_state == 'Draft' || $moderation_state == 'Draft, needs review') {
-        $form['field_publish_date']['widget'][0]['#description'] = 'The revision is scheduled to publish on ' . $date . ' at ' . $time . ', but will only do so if this draft is approved. Currently, the draft is NOT approved.';
-      }
-
-      // If the current revision is published and has a Sunset Date set, update Sunset Date help text.
-      if ($form['status']['widget']['value']['#title'] == 'Published' && isset($form['field_expiration_date']['widget'][0]['value']['#default_value'])) {
-        $form['field_expiration_date']['widget'][0]['#description'] = 'This content will automatically sunset, and be unpublished, on ' . $date . ' at ' . $time . '.';
-      }
-    }
   }
 }
 
@@ -667,6 +647,38 @@ function epa_workflow_module_implements_alter(&$implementations, $hook) {
  */
 function epa_workflow_form_revision_overview_form_alter(&$form, FormStateInterface $form_state, $form_id) {
   $form['node_revisions_table'][0]['operations']['#prefix'] = '<strong>Latest revision</strong><br>';
+
+  $node = $form_state->getBuildInfo()['args'][0];
+
+  // Loading will always return the "Current revision".
+  /** @var \Drupal\node\NodeInterface $current */
+  $current = \Drupal::entityTypeManager()
+    ->getStorage('node')
+    ->load($node->id());
+
+  // If editing latest revision and has a Publish Date set.
+  if ($node->getRevisionId() == $current->getRevisionId() && isset($node->field_publish_date->value)) {
+    $moderation_state = $node->moderation_state->value;
+    $date = $node->field_publish_date->date->format('F d, Y');
+    $time = $node->field_publish_date->date->format('h:i a');
+    $message = $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'];
+
+    // Is in the “Draft, approved” state.
+    if ($moderation_state == 'draft_approved') {
+      $message .= '<br>The revision will publish on ' . $date . ' at ' . $time . '.';
+      $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'] = $message;
+    }
+    // Is in any other draft state.
+    else if ($moderation_state == 'draft' || $moderation_state == 'draft_needs_review') {
+      $message .= '<br>The revision is scheduled to publish on ' . $date . ' at ' . $time . ', but will only do so if this draft is approved. Currently, the draft is NOT approved.';
+      $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'] = $message;
+    }
+    // If the current revision is published and has a Sunset Date set, update Sunset Date help text.
+    else if ($node->status->value == 1 && isset($node->field_expiration_date->value)) {
+      $message .= '<br>This content will automatically sunset, and be unpublished, on ' . $date . ' at ' . $time . '.';
+      $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'] = $message;
+    }
+  }
 }
 
 /**

From 6412a00d639dcec1d26ef3b8b1df406ce9079b5e Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Sun, 16 Jan 2022 23:11:39 -0800
Subject: [PATCH 75/87] [EPAD8-1579] Add check for instanceof nodeinterface and
 !isnew

---
 .../custom/epa_workflow/epa_workflow.module   | 55 ++++++++++---------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
index 5d1d44b508..d0666d65ed 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
@@ -649,34 +649,35 @@ function epa_workflow_form_revision_overview_form_alter(&$form, FormStateInterfa
   $form['node_revisions_table'][0]['operations']['#prefix'] = '<strong>Latest revision</strong><br>';
 
   $node = $form_state->getBuildInfo()['args'][0];
+  if ($node instanceof NodeInterface && !$node->isNew()) {
+    // Loading will always return the "Current revision".
+    /** @var \Drupal\node\NodeInterface $current */
+    $current = \Drupal::entityTypeManager()
+      ->getStorage('node')
+      ->load($node->id());
 
-  // Loading will always return the "Current revision".
-  /** @var \Drupal\node\NodeInterface $current */
-  $current = \Drupal::entityTypeManager()
-    ->getStorage('node')
-    ->load($node->id());
-
-  // If editing latest revision and has a Publish Date set.
-  if ($node->getRevisionId() == $current->getRevisionId() && isset($node->field_publish_date->value)) {
-    $moderation_state = $node->moderation_state->value;
-    $date = $node->field_publish_date->date->format('F d, Y');
-    $time = $node->field_publish_date->date->format('h:i a');
-    $message = $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'];
-
-    // Is in the “Draft, approved” state.
-    if ($moderation_state == 'draft_approved') {
-      $message .= '<br>The revision will publish on ' . $date . ' at ' . $time . '.';
-      $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'] = $message;
-    }
-    // Is in any other draft state.
-    else if ($moderation_state == 'draft' || $moderation_state == 'draft_needs_review') {
-      $message .= '<br>The revision is scheduled to publish on ' . $date . ' at ' . $time . ', but will only do so if this draft is approved. Currently, the draft is NOT approved.';
-      $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'] = $message;
-    }
-    // If the current revision is published and has a Sunset Date set, update Sunset Date help text.
-    else if ($node->status->value == 1 && isset($node->field_expiration_date->value)) {
-      $message .= '<br>This content will automatically sunset, and be unpublished, on ' . $date . ' at ' . $time . '.';
-      $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'] = $message;
+    // If editing latest revision and has a Publish Date set.
+    if ($node->getRevisionId() == $current->getRevisionId() && isset($node->field_publish_date->value)) {
+      $moderation_state = $node->moderation_state->value;
+      $date = $node->field_publish_date->date->format('F d, Y');
+      $time = $node->field_publish_date->date->format('h:i a');
+      $message = $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'];
+
+      // Is in the “Draft, approved” state.
+      if ($moderation_state == 'draft_approved') {
+        $message .= '<br>The revision will publish on ' . $date . ' at ' . $time . '.';
+        $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'] = $message;
+      }
+      // Is in any other draft state.
+      else if ($moderation_state == 'draft' || $moderation_state == 'draft_needs_review') {
+        $message .= '<br>The revision is scheduled to publish on ' . $date . ' at ' . $time . ', but will only do so if this draft is approved. Currently, the draft is NOT approved.';
+        $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'] = $message;
+      }
+      // If the current revision is published and has a Sunset Date set, update Sunset Date help text.
+      else if ($node->status->value == 1 && isset($node->field_expiration_date->value)) {
+        $message .= '<br>This content will automatically sunset, and be unpublished, on ' . $date . ' at ' . $time . '.';
+        $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'] = $message;
+      }
     }
   }
 }

From 3a18373e3f7a295d07f824691302e6599040dc92 Mon Sep 17 00:00:00 2001
From: Dan Mouyard <dcmouyard@gmail.com>
Date: Mon, 17 Jan 2022 15:07:59 -0500
Subject: [PATCH 76/87] EPAD8-1578: Fix typos in resource directory template

---
 .../epa_layouts/layouts/epa-resource-directory.html.twig      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/drupal/web/modules/custom/epa_layouts/layouts/epa-resource-directory.html.twig b/services/drupal/web/modules/custom/epa_layouts/layouts/epa-resource-directory.html.twig
index 9022478324..2898bb9342 100644
--- a/services/drupal/web/modules/custom/epa_layouts/layouts/epa-resource-directory.html.twig
+++ b/services/drupal/web/modules/custom/epa_layouts/layouts/epa-resource-directory.html.twig
@@ -58,7 +58,7 @@
 
 {% if main_content|trim and content_sidebar %}
   {% set sidebar_classes = ['l-sidebar__sidebar'] %}
-  <div{{ attributes.addClass(['l-sidebar']) }}">
+  <div{{ attributes.addClass(['l-sidebar']) }}>
     <div class="l-sidebar__main">
       {{ main_content }}
     </div>
@@ -67,7 +67,7 @@
     </div>
   </div>
 {% else %}
-  <div{{ attributes }}">
+  <div{{ attributes }}>
     {{ main_content }}
     {{ content_sidebar }}
   </div>

From 2c5906aec270096a531378020d30b974d169371c Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Mon, 17 Jan 2022 14:37:46 -0800
Subject: [PATCH 77/87] [EPAD8-1579] Update hook to account for forward
 revisions

---
 .../custom/epa_workflow/epa_workflow.module   | 54 +++++++++++--------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
index d0666d65ed..00021bc442 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
@@ -648,35 +648,43 @@ function epa_workflow_module_implements_alter(&$implementations, $hook) {
 function epa_workflow_form_revision_overview_form_alter(&$form, FormStateInterface $form_state, $form_id) {
   $form['node_revisions_table'][0]['operations']['#prefix'] = '<strong>Latest revision</strong><br>';
 
-  $node = $form_state->getBuildInfo()['args'][0];
-  if ($node instanceof NodeInterface && !$node->isNew()) {
-    // Loading will always return the "Current revision".
-    /** @var \Drupal\node\NodeInterface $current */
-    $current = \Drupal::entityTypeManager()
-      ->getStorage('node')
-      ->load($node->id());
-
-    // If editing latest revision and has a Publish Date set.
-    if ($node->getRevisionId() == $current->getRevisionId() && isset($node->field_publish_date->value)) {
-      $moderation_state = $node->moderation_state->value;
-      $date = $node->field_publish_date->date->format('F d, Y');
-      $time = $node->field_publish_date->date->format('h:i a');
-      $message = $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'];
+  $current_revision = $form_state->getBuildInfo()['args'][0];
+
+  $latest_vid = \Drupal::entityTypeManager()
+    ->getStorage('node')
+    ->getLatestRevisionId($current_revision->id());
+  $latest_revision = \Drupal::entityTypeManager()
+    ->getStorage('node')
+    ->loadRevision($latest_vid);
+
+  if ($latest_revision instanceof NodeInterface && !$latest_revision->isNew()) {
+    // If latest revision and has a Publish Date set.
+    if (isset($latest_revision->field_publish_date->value)) {
+      $latest_revision_moderation_state = $latest_revision->moderation_state->value;
+      $latest_revision_date = $latest_revision->field_publish_date->date->format('F d, Y');
+      $latest_revision_time = $latest_revision->field_publish_date->date->format('h:i a');
 
       // Is in the “Draft, approved” state.
-      if ($moderation_state == 'draft_approved') {
-        $message .= '<br>The revision will publish on ' . $date . ' at ' . $time . '.';
-        $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'] = $message;
+      if ($latest_revision_moderation_state == 'draft_approved') {
+        $message = '<br>The revision will publish on ' . $latest_revision_date . ' at ' . $latest_revision_time . '.';
+        $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'] .= $message;
       }
       // Is in any other draft state.
-      else if ($moderation_state == 'draft' || $moderation_state == 'draft_needs_review') {
-        $message .= '<br>The revision is scheduled to publish on ' . $date . ' at ' . $time . ', but will only do so if this draft is approved. Currently, the draft is NOT approved.';
-        $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'] = $message;
+      else if ($latest_revision_moderation_state == 'draft' || $latest_revision_moderation_state == 'draft_needs_review') {
+        $message = '<br>The revision is scheduled to publish on ' . $latest_revision_date . ' at ' . $latest_revision_time . ', but will only do so if this draft is approved. Currently, the draft is NOT approved.';
+        $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'] .= $message;
       }
       // If the current revision is published and has a Sunset Date set, update Sunset Date help text.
-      else if ($node->status->value == 1 && isset($node->field_expiration_date->value)) {
-        $message .= '<br>This content will automatically sunset, and be unpublished, on ' . $date . ' at ' . $time . '.';
-        $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'] = $message;
+      if ($current_revision->status->value == 1 && isset($current_revision->field_expiration_date->value)) {
+        $current_revision_date = $current_revision->field_publish_date->date->format('F d, Y');
+        $current_revision_time = $current_revision->field_publish_date->date->format('h:i a');  
+        $message = '<br>This content will automatically sunset, and be unpublished, on ' . $current_revision_date . ' at ' . $current_revision_time . '.';
+        // search for current revision.
+        foreach ($form['node_revisions_table'] as $delta => $revision) {
+          if (isset($revision['#attributes']) && in_array('revision-current', $revision['#attributes']['class'])) {
+            $form['node_revisions_table'][$delta]['revision']['#context']['message']['#markup'] .= $message;
+          }
+        }
       }
     }
   }

From cedcf76062452a9b937e17d0a1cec99011d67eb7 Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Mon, 17 Jan 2022 15:17:22 -0800
Subject: [PATCH 78/87] [EPAD8-1579] Take current revision conditional out of
 latest revision confition

---
 .../custom/epa_workflow/epa_workflow.module   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
index 00021bc442..dfc7fdf33d 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
@@ -674,16 +674,16 @@ function epa_workflow_form_revision_overview_form_alter(&$form, FormStateInterfa
         $message = '<br>The revision is scheduled to publish on ' . $latest_revision_date . ' at ' . $latest_revision_time . ', but will only do so if this draft is approved. Currently, the draft is NOT approved.';
         $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'] .= $message;
       }
-      // If the current revision is published and has a Sunset Date set, update Sunset Date help text.
-      if ($current_revision->status->value == 1 && isset($current_revision->field_expiration_date->value)) {
-        $current_revision_date = $current_revision->field_publish_date->date->format('F d, Y');
-        $current_revision_time = $current_revision->field_publish_date->date->format('h:i a');  
-        $message = '<br>This content will automatically sunset, and be unpublished, on ' . $current_revision_date . ' at ' . $current_revision_time . '.';
-        // search for current revision.
-        foreach ($form['node_revisions_table'] as $delta => $revision) {
-          if (isset($revision['#attributes']) && in_array('revision-current', $revision['#attributes']['class'])) {
-            $form['node_revisions_table'][$delta]['revision']['#context']['message']['#markup'] .= $message;
-          }
+    }
+    // If the current revision is published and has a Sunset Date set.
+    if ($current_revision->status->value == 1 && isset($current_revision->field_expiration_date->value)) {
+      $current_revision_date = $current_revision->field_publish_date->date->format('F d, Y');
+      $current_revision_time = $current_revision->field_publish_date->date->format('h:i a');  
+      $message = '<br>This content will automatically sunset, and be unpublished, on ' . $current_revision_date . ' at ' . $current_revision_time . '.';
+      // search for current revision.
+      foreach ($form['node_revisions_table'] as $delta => $revision) {
+        if (isset($revision['#attributes']) && in_array('revision-current', $revision['#attributes']['class'])) {
+          $form['node_revisions_table'][$delta]['revision']['#context']['message']['#markup'] .= $message;
         }
       }
     }

From 1edd0ab6194bd97b1e85497aa26cec3108ef7ea1 Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Mon, 17 Jan 2022 15:22:18 -0800
Subject: [PATCH 79/87] [EPAD8-1579] Update sunset date to
 field_expiration_date

---
 .../web/modules/custom/epa_workflow/epa_workflow.module     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
index dfc7fdf33d..df555605cd 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
@@ -677,9 +677,9 @@ function epa_workflow_form_revision_overview_form_alter(&$form, FormStateInterfa
     }
     // If the current revision is published and has a Sunset Date set.
     if ($current_revision->status->value == 1 && isset($current_revision->field_expiration_date->value)) {
-      $current_revision_date = $current_revision->field_publish_date->date->format('F d, Y');
-      $current_revision_time = $current_revision->field_publish_date->date->format('h:i a');  
-      $message = '<br>This content will automatically sunset, and be unpublished, on ' . $current_revision_date . ' at ' . $current_revision_time . '.';
+      $current_revision_sunset_date = $current_revision->field_expiration_date->date->format('F d, Y');
+      $current_revision_sunset_time = $current_revision->field_expiration_date->date->format('h:i a');  
+      $message = '<br>This content will automatically sunset, and be unpublished, on ' . $current_revision_sunset_date . ' at ' . $current_revision_sunset_time . '.';
       // search for current revision.
       foreach ($form['node_revisions_table'] as $delta => $revision) {
         if (isset($revision['#attributes']) && in_array('revision-current', $revision['#attributes']['class'])) {

From 8f2357da4a24ebb33a912ce477d318307c086f15 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Wed, 19 Jan 2022 09:41:27 -0500
Subject: [PATCH 80/87] EPAD8-298 allow users to edit paragraph library item
 author

---
 ...ary_item.paragraphs_library_item.default.yml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/services/drupal/config/sync/core.entity_form_display.paragraphs_library_item.paragraphs_library_item.default.yml b/services/drupal/config/sync/core.entity_form_display.paragraphs_library_item.paragraphs_library_item.default.yml
index 6f416af603..937f360c79 100644
--- a/services/drupal/config/sync/core.entity_form_display.paragraphs_library_item.paragraphs_library_item.default.yml
+++ b/services/drupal/config/sync/core.entity_form_display.paragraphs_library_item.paragraphs_library_item.default.yml
@@ -13,7 +13,7 @@ bundle: paragraphs_library_item
 mode: default
 content:
   field_web_areas:
-    weight: 26
+    weight: 4
     settings:
       match_operator: CONTAINS
       match_limit: 10
@@ -24,7 +24,7 @@ content:
     region: content
   label:
     type: string_textfield
-    weight: -5
+    weight: 0
     region: content
     settings:
       size: 60
@@ -39,7 +39,7 @@ content:
     third_party_settings: {  }
   paragraphs:
     type: paragraphs
-    weight: 0
+    weight: 1
     region: content
     settings:
       title: Paragraph
@@ -62,6 +62,15 @@ content:
     weight: 3
     region: content
     third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 5
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
 hidden:
   created: true
-  uid: true

From 5e10304ad6a57c899f73436d1dc0840f2bfe578c Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Wed, 19 Jan 2022 12:56:40 -0500
Subject: [PATCH 81/87] EPAD8-1572 move filter to be more consistent

---
 .../sync/views.view.published_content.yml     | 106 +++++++++---------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/services/drupal/config/sync/views.view.published_content.yml b/services/drupal/config/sync/views.view.published_content.yml
index 8e80c16e00..89f6b913d6 100644
--- a/services/drupal/config/sync/views.view.published_content.yml
+++ b/services/drupal/config/sync/views.view.published_content.yml
@@ -1523,6 +1523,59 @@ display:
           entity_type: user
           entity_field: uid
           plugin_id: user_name
+        field_publisher_target_id:
+          id: field_publisher_target_id
+          table: group__field_publisher
+          field: field_publisher_target_id
+          relationship: gid
+          group_type: group
+          admin_label: ''
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_publisher_target_id_op
+            label: Publisher
+            description: ''
+            use_operator: false
+            operator: field_publisher_target_id_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: field_publisher_target_id
+            required: false
+            remember: false
+            multiple: true
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              layout_editor: '0'
+              alerts_manager: '0'
+              block_manager: '0'
+              system_editor: '0'
+              system_webmaster: '0'
+              menu_admin: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: false
+          type: textfield
+          limit: true
+          vid: epa_organization
+          hierarchy: false
+          error_message: true
+          plugin_id: taxonomy_index_tid
         moderation_state:
           id: moderation_state
           table: node_field_data
@@ -1671,59 +1724,6 @@ display:
             group_items: {  }
           entity_type: group_content
           plugin_id: epa_web_areas_users_groups
-        field_publisher_target_id:
-          id: field_publisher_target_id
-          table: group__field_publisher
-          field: field_publisher_target_id
-          relationship: gid
-          group_type: group
-          admin_label: ''
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_publisher_target_id_op
-            label: Publisher
-            description: ''
-            use_operator: false
-            operator: field_publisher_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_publisher_target_id
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              layout_editor: '0'
-              alerts_manager: '0'
-              block_manager: '0'
-              system_editor: '0'
-              system_webmaster: '0'
-              menu_admin: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          type: textfield
-          limit: true
-          vid: epa_organization
-          hierarchy: false
-          error_message: true
-          plugin_id: taxonomy_index_tid
       filter_groups:
         operator: AND
         groups:

From 9c830a04e82a9d613ce20f8174f235972f487b8b Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Wed, 19 Jan 2022 12:57:53 -0500
Subject: [PATCH 82/87] EPAD8-1559 rename filter for perspective authors to
 Byline

---
 .../drupal/config/sync/views.view.dynamic_list_perspectives.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/drupal/config/sync/views.view.dynamic_list_perspectives.yml b/services/drupal/config/sync/views.view.dynamic_list_perspectives.yml
index 7b9b2cc611..6f3e28bb03 100644
--- a/services/drupal/config/sync/views.view.dynamic_list_perspectives.yml
+++ b/services/drupal/config/sync/views.view.dynamic_list_perspectives.yml
@@ -142,7 +142,7 @@ display:
           exposed: true
           expose:
             operator_id: field_author_names_target_id_op
-            label: Name
+            label: Byline
             description: ''
             use_operator: false
             operator: field_author_names_target_id_op

From 56fcb0b102e1caea3cbbeade5ca13b7e0a7c3c43 Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Wed, 19 Jan 2022 11:28:32 -0800
Subject: [PATCH 83/87] [EPAD8-1579] Adjust for correct timezone

---
 .../custom/epa_workflow/epa_workflow.module   | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
index df555605cd..5978937369 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
@@ -661,8 +661,14 @@ function epa_workflow_form_revision_overview_form_alter(&$form, FormStateInterfa
     // If latest revision and has a Publish Date set.
     if (isset($latest_revision->field_publish_date->value)) {
       $latest_revision_moderation_state = $latest_revision->moderation_state->value;
-      $latest_revision_date = $latest_revision->field_publish_date->date->format('F d, Y');
-      $latest_revision_time = $latest_revision->field_publish_date->date->format('h:i a');
+      $timezone = date_default_timezone_get();
+      $date_formatter = \Drupal::service('date.formatter');
+
+      $latest_formatted_date_time = $date_formatter->format(
+        $latest_revision->field_publish_date->date->getTimestamp(), 'custom', 'F d, Y-h:i a', $timezone
+      );
+      $latest_revision_date = substr($latest_formatted_date_time, 0, strpos($latest_formatted_date_time, '-'));
+      $latest_revision_time = substr($latest_formatted_date_time, strpos($latest_formatted_date_time, '-') + 1, strlen($latest_formatted_date_time) - 1);
 
       // Is in the “Draft, approved” state.
       if ($latest_revision_moderation_state == 'draft_approved') {
@@ -677,9 +683,13 @@ function epa_workflow_form_revision_overview_form_alter(&$form, FormStateInterfa
     }
     // If the current revision is published and has a Sunset Date set.
     if ($current_revision->status->value == 1 && isset($current_revision->field_expiration_date->value)) {
-      $current_revision_sunset_date = $current_revision->field_expiration_date->date->format('F d, Y');
-      $current_revision_sunset_time = $current_revision->field_expiration_date->date->format('h:i a');  
-      $message = '<br>This content will automatically sunset, and be unpublished, on ' . $current_revision_sunset_date . ' at ' . $current_revision_sunset_time . '.';
+      $current_formatted_date_time = $date_formatter->format(
+        $current_revision->field_expiration_date->date->getTimestamp(), 'custom', 'F d, Y-h:i a', $timezone
+      );
+      $current_sunset_date = substr($current_formatted_date_time, 0, strpos($current_formatted_date_time, '-'));
+      $current_sunset_time = substr($current_formatted_date_time, strpos($current_formatted_date_time, '-') + 1, strlen($current_formatted_date_time) - 1);
+
+      $message = '<br>This content will automatically sunset, and be unpublished, on ' . $current_sunset_date . ' at ' . $current_sunset_time . '.';
       // search for current revision.
       foreach ($form['node_revisions_table'] as $delta => $revision) {
         if (isset($revision['#attributes']) && in_array('revision-current', $revision['#attributes']['class'])) {

From aee5c1baea46a3691e9d67c824759dbc00bd6943 Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Wed, 19 Jan 2022 13:42:00 -0800
Subject: [PATCH 84/87] [EPAD8-1579] Update format string

---
 .../custom/epa_workflow/epa_workflow.module        | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
index 5978937369..9ee179f1a0 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
@@ -665,31 +665,27 @@ function epa_workflow_form_revision_overview_form_alter(&$form, FormStateInterfa
       $date_formatter = \Drupal::service('date.formatter');
 
       $latest_formatted_date_time = $date_formatter->format(
-        $latest_revision->field_publish_date->date->getTimestamp(), 'custom', 'F d, Y-h:i a', $timezone
+        $latest_revision->field_publish_date->date->getTimestamp(), 'custom', 'F d, Y \a\t h:i a T', $timezone
       );
-      $latest_revision_date = substr($latest_formatted_date_time, 0, strpos($latest_formatted_date_time, '-'));
-      $latest_revision_time = substr($latest_formatted_date_time, strpos($latest_formatted_date_time, '-') + 1, strlen($latest_formatted_date_time) - 1);
 
       // Is in the “Draft, approved” state.
       if ($latest_revision_moderation_state == 'draft_approved') {
-        $message = '<br>The revision will publish on ' . $latest_revision_date . ' at ' . $latest_revision_time . '.';
+        $message = '<br>The revision will publish on ' . $latest_formatted_date_time . '.';
         $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'] .= $message;
       }
       // Is in any other draft state.
       else if ($latest_revision_moderation_state == 'draft' || $latest_revision_moderation_state == 'draft_needs_review') {
-        $message = '<br>The revision is scheduled to publish on ' . $latest_revision_date . ' at ' . $latest_revision_time . ', but will only do so if this draft is approved. Currently, the draft is NOT approved.';
+        $message = '<br>The revision is scheduled to publish on ' . $latest_formatted_date_time . ', but will only do so if this draft is approved. Currently, the draft is NOT approved.';
         $form['node_revisions_table'][0]['revision']['#context']['message']['#markup'] .= $message;
       }
     }
     // If the current revision is published and has a Sunset Date set.
     if ($current_revision->status->value == 1 && isset($current_revision->field_expiration_date->value)) {
       $current_formatted_date_time = $date_formatter->format(
-        $current_revision->field_expiration_date->date->getTimestamp(), 'custom', 'F d, Y-h:i a', $timezone
+        $current_revision->field_expiration_date->date->getTimestamp(), 'custom', 'F d, Y \a\t h:i a T', $timezone
       );
-      $current_sunset_date = substr($current_formatted_date_time, 0, strpos($current_formatted_date_time, '-'));
-      $current_sunset_time = substr($current_formatted_date_time, strpos($current_formatted_date_time, '-') + 1, strlen($current_formatted_date_time) - 1);
 
-      $message = '<br>This content will automatically sunset, and be unpublished, on ' . $current_sunset_date . ' at ' . $current_sunset_time . '.';
+      $message = '<br>This content will automatically sunset, and be unpublished, on ' . $current_formatted_date_time . '.';
       // search for current revision.
       foreach ($form['node_revisions_table'] as $delta => $revision) {
         if (isset($revision['#attributes']) && in_array('revision-current', $revision['#attributes']['class'])) {

From 664c55dc9ab8eb6ed43974d17f99c9330fb78248 Mon Sep 17 00:00:00 2001
From: Nathan Han <nh0713@uw.edu>
Date: Wed, 19 Jan 2022 13:56:19 -0800
Subject: [PATCH 85/87] [EPAD8-1579] Update sunset conditional

---
 .../drupal/web/modules/custom/epa_workflow/epa_workflow.module  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
index 9ee179f1a0..f49d04fd69 100644
--- a/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
+++ b/services/drupal/web/modules/custom/epa_workflow/epa_workflow.module
@@ -680,7 +680,7 @@ function epa_workflow_form_revision_overview_form_alter(&$form, FormStateInterfa
       }
     }
     // If the current revision is published and has a Sunset Date set.
-    if ($current_revision->status->value == 1 && isset($current_revision->field_expiration_date->value)) {
+    if ($current_revision->status->value && isset($current_revision->field_expiration_date->value)) {
       $current_formatted_date_time = $date_formatter->format(
         $current_revision->field_expiration_date->date->getTimestamp(), 'custom', 'F d, Y \a\t h:i a T', $timezone
       );

From e6317fc07c30e82a10bacdc5ae1ff8a78804680d Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Thu, 20 Jan 2022 11:09:51 -0500
Subject: [PATCH 86/87] EPAD8-1589 patch SMTP module to log email subject

---
 services/drupal/composer.patches.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/drupal/composer.patches.json b/services/drupal/composer.patches.json
index da75ec94a1..6cc1083a42 100644
--- a/services/drupal/composer.patches.json
+++ b/services/drupal/composer.patches.json
@@ -158,7 +158,8 @@
       "Fix validation problem where iframe would not dismiss": "https://www.drupal.org/files/issues/2021-03-22/layout_builder_iframe_modal-avoid_validation_ajax_trap-3202523-10.patch"
     },
     "drupal/smtp": {
-      "Fixes invalid address: (Reply-To) error": "https://www.drupal.org/files/issues/2021-03-11/smtp_invalid-address_reply-to_3191046_13.patch"
+      "Fixes invalid address: (Reply-To) error": "https://www.drupal.org/files/issues/2021-03-11/smtp_invalid-address_reply-to_3191046_13.patch",
+      "Add subject to log message": "https://www.drupal.org/files/issues/2020-08-18/3165981-3.patch"
     },
     "drupal/group_content_menu": {
       "Set active trail correctly": "https://www.drupal.org/files/issues/2021-04-21/group_content_menu-active_trail_cache_problem-3209011-10.patch",

From 68466086d4d2342d4c84415b330f0fb762e27a55 Mon Sep 17 00:00:00 2001
From: Aaron Zinck <azinck@gmail.com>
Date: Mon, 24 Jan 2022 13:55:50 -0500
Subject: [PATCH 87/87] Patch layout builder for improved performance

---
 services/drupal/composer.patches.json         |  3 +-
 ...ayout-builder-performance-3186116-11.patch | 85 +++++++++++++++++++
 2 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 services/drupal/patches/drupal-layout-builder-performance-3186116-11.patch

diff --git a/services/drupal/composer.patches.json b/services/drupal/composer.patches.json
index 6cc1083a42..d7ea0f5f46 100644
--- a/services/drupal/composer.patches.json
+++ b/services/drupal/composer.patches.json
@@ -39,7 +39,8 @@
       "Improve consistency of revision terminology labeling in revision UI": "https://www.drupal.org/files/issues/2021-12-03/2899719-D9_2-36.patch",
       "Allow reverting current revision": "https://www.drupal.org/files/issues/2021-12-10/allow-reverting-current-rev-3252521-D9_2-5.patch",
       "Prevent reverting latest revision (custom patch so that it plays nicely with our patches for 3252521 and 2899719)": "patches/disallow-reverting-latest-rev-3252540-D9_2-2-custom.patch",
-      "Use EPA-preferred terminology for revision reversion operation. This patch needs to be applied on top of the patches for 3252521, 2899719, and 3252540": "patches/rename-revision-revert-operation-button.patch"
+      "Use EPA-preferred terminology for revision reversion operation. This patch needs to be applied on top of the patches for 3252521, 2899719, and 3252540": "patches/rename-revision-revert-operation-button.patch",
+      "Improve layout builder performance by reducing number of calls to checkRequirements": "patches/drupal-layout-builder-performance-3186116-11.patch"
     },
     "drupal/s3fs": {
       "Module should initialize default credentials provider instead of instance profile when use_instance_profile is TRUE": "https://www.drupal.org/files/issues/2020-03-24/3122091-2-s3fs-default-provider.patch",
diff --git a/services/drupal/patches/drupal-layout-builder-performance-3186116-11.patch b/services/drupal/patches/drupal-layout-builder-performance-3186116-11.patch
new file mode 100644
index 0000000000..77037e010a
--- /dev/null
+++ b/services/drupal/patches/drupal-layout-builder-performance-3186116-11.patch
@@ -0,0 +1,85 @@
+diff --git a/core/lib/Drupal/Core/Plugin/Context/ContextHandler.php b/core/lib/Drupal/Core/Plugin/Context/ContextHandler.php
+index 587fe66b1f9a6ad0ae6d044ef0dbf09856e0e3c4..96fbf9e0d645ef1e53fd0332553adb856e821ef8 100644
+--- a/core/lib/Drupal/Core/Plugin/Context/ContextHandler.php
++++ b/core/lib/Drupal/Core/Plugin/Context/ContextHandler.php
+@@ -62,13 +62,33 @@ protected function getContextDefinitions($plugin_definition) {
+    */
+   public function checkRequirements(array $contexts, array $requirements) {
+     foreach ($requirements as $requirement) {
+-      if ($requirement->isRequired() && !$this->getMatchingContexts($contexts, $requirement)) {
++      if ($requirement->isRequired() && !$this->isAnyContextMatching($contexts, $requirement)) {
+         return FALSE;
+       }
+     }
+     return TRUE;
+   }
+ 
++  /**
++   * Determines if any contexts satisfy the constraints of a given definition.
++   *
++   * @param \Drupal\Core\Plugin\Context\ContextInterface[] $contexts
++   *   An array of contexts.
++   * @param \Drupal\Core\Plugin\Context\ContextDefinitionInterface $definition
++   *   The definition to satisfy.
++   *
++   * @return bool
++   *   TRUE if any of the contexts satisfy the constraints, FALSE otherwise.
++   */
++  private function isAnyContextMatching(array $contexts, ContextDefinitionInterface $definition): bool {
++    foreach ($contexts as $context) {
++      if ($definition->isSatisfiedBy($context)) {
++        return TRUE;
++      }
++    }
++    return FALSE;
++  }
++
+   /**
+    * {@inheritdoc}
+    */
+diff --git a/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php b/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php
+index 075cd51d92f6be29e47308b6da15faf8b5dd142d..66c7ffa13033d66b62e078b198833793e9747bc9 100644
+--- a/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php
++++ b/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php
+@@ -19,7 +19,9 @@
+ use Drupal\Core\DependencyInjection\ContainerBuilder;
+ use Drupal\Core\Extension\ModuleHandlerInterface;
+ use Drupal\Core\Plugin\Context\ContextDefinition;
++use Drupal\Core\Plugin\Context\ContextDefinitionInterface;
+ use Drupal\Core\Plugin\Context\ContextHandler;
++use Drupal\Core\Plugin\Context\ContextInterface;
+ use Drupal\Core\Plugin\ContextAwarePluginInterface;
+ use Drupal\Core\TypedData\TypedDataManager;
+ use Drupal\Core\Validation\ConstraintManager;
+@@ -124,6 +126,31 @@ public function providerTestCheckRequirements() {
+     return $data;
+   }
+ 
++  /**
++   * @covers ::checkRequirements
++   */
++  public function testCheckRequirementsEarlyReturn() {
++    // Set up three contexts.
++    $context1 = $this->prophesize(ContextInterface::class);
++    $context2 = $this->prophesize(ContextInterface::class);
++    $context3 = $this->prophesize(ContextInterface::class);
++    $contexts[] = $context1->reveal();
++    $contexts[] = $context2->reveal();
++    $contexts[] = $context3->reveal();
++
++    $requirement = $this->prophesize(ContextDefinitionInterface::class);
++    $requirement->isRequired()->willReturn(TRUE);
++
++    // Set the second context to satisfy the requirement. The third context
++    // should not be checked.
++    $requirement->isSatisfiedBy($context1)->willReturn(FALSE);
++    $requirement->isSatisfiedBy($context2)->willReturn(TRUE);
++    $requirement->isSatisfiedBy($context3)->shouldNotBeCalled();
++
++    $requirements[] = $requirement->reveal();
++    $this->contextHandler->checkRequirements($contexts, $requirements);
++  }
++
+   /**
+    * @covers ::getMatchingContexts
+    *