From c28506abb2d998e4170e2062b7bf17bded803f68 Mon Sep 17 00:00:00 2001
From: Chris Green <chrisgreen@arizona.edu>
Date: Wed, 30 Oct 2024 10:15:04 -0700
Subject: [PATCH 01/41] Close #3842 Content editors can now upload and use webp
 images with their content. (#3843)

---
 config/install/field.field.user.user.user_picture.yml           | 2 +-
 .../az_core/config/install/linkit.linkit_profile.az_linkit.yml  | 2 +-
 .../install/field.field.media.az_image.field_media_az_image.yml | 2 +-
 themes/custom/az_barrio/theme-settings.php                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/install/field.field.user.user.user_picture.yml b/config/install/field.field.user.user.user_picture.yml
index e06bd7d74d..104bf139ba 100644
--- a/config/install/field.field.user.user.user_picture.yml
+++ b/config/install/field.field.user.user.user_picture.yml
@@ -17,7 +17,7 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
-  file_extensions: 'png gif jpg jpeg'
+  file_extensions: 'png gif jpg jpeg webp'
   file_directory: 'pictures/[date:custom:Y]-[date:custom:m]'
   max_filesize: ''
   alt_field: false
diff --git a/modules/custom/az_core/config/install/linkit.linkit_profile.az_linkit.yml b/modules/custom/az_core/config/install/linkit.linkit_profile.az_linkit.yml
index d7d68a38cd..5fe22447ef 100644
--- a/modules/custom/az_core/config/install/linkit.linkit_profile.az_linkit.yml
+++ b/modules/custom/az_core/config/install/linkit.linkit_profile.az_linkit.yml
@@ -36,7 +36,7 @@ matchers:
       group_by_bundle: null
       substitution_type: file
       limit: 100
-      file_extensions: 'pdf doc docx pps ppt xlsx xls png jpg jpeg'
+      file_extensions: 'pdf doc docx pps ppt xlsx xls png jpg jpeg webp'
       file_status: 1
       images:
         show_dimensions: false
diff --git a/modules/custom/az_media/config/install/field.field.media.az_image.field_media_az_image.yml b/modules/custom/az_media/config/install/field.field.media.az_image.field_media_az_image.yml
index 9f57327855..b7e9966eb6 100644
--- a/modules/custom/az_media/config/install/field.field.media.az_image.field_media_az_image.yml
+++ b/modules/custom/az_media/config/install/field.field.media.az_image.field_media_az_image.yml
@@ -23,7 +23,7 @@ settings:
   handler: 'default:file'
   handler_settings: {  }
   file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'png gif jpg jpeg'
+  file_extensions: 'png gif jpg jpeg webp'
   max_filesize: ''
   max_resolution: ''
   min_resolution: ''
diff --git a/themes/custom/az_barrio/theme-settings.php b/themes/custom/az_barrio/theme-settings.php
index 1674b6310e..ef9d7a2723 100644
--- a/themes/custom/az_barrio/theme-settings.php
+++ b/themes/custom/az_barrio/theme-settings.php
@@ -383,7 +383,7 @@ function az_barrio_form_system_theme_settings_alter(&$form, FormStateInterface $
     '#description' => t("If you don't have direct file access to the server, use this field to upload your footer logo."),
     '#upload_validators' => [
       'FileExtension' => [
-        'extensions' => 'png gif jpg jpeg apng svg',
+        'extensions' => 'png gif jpg jpeg apng svg webp',
       ],
     ],
   ];

From 1eccee414c40c3ffb18702449d24a7db78cf8bb0 Mon Sep 17 00:00:00 2001
From: Chris Green <chrisgreen@arizona.edu>
Date: Wed, 30 Oct 2024 10:28:27 -0700
Subject: [PATCH 02/41] Close #1479 exclude Drupal 6 migrations from appearing
 when running drush migrate:status (#3840)

Co-authored-by: Joe Parsons <471936+joeparsons@users.noreply.github.com>
---
 modules/custom/az_migration/az_migration.module | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 modules/custom/az_migration/az_migration.module

diff --git a/modules/custom/az_migration/az_migration.module b/modules/custom/az_migration/az_migration.module
new file mode 100644
index 0000000000..57c096a085
--- /dev/null
+++ b/modules/custom/az_migration/az_migration.module
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * @file
+ * Contains az_migration.module.
+ */
+
+/**
+ * Implements hook_migration_plugins_aler().
+ */
+function az_migration_migration_plugins_alter(array &$migrations) {
+  $migrations = array_filter($migrations, function (array $migration) {
+    $tags = isset($migration['migration_tags']) ? (array) $migration['migration_tags'] : [];
+    return !in_array('Drupal 6', $tags);
+  });
+}

From 5f123366c406a645c9bcb3d49058b725b9ecc3c4 Mon Sep 17 00:00:00 2001
From: Chris Green <chrisgreen@arizona.edu>
Date: Wed, 30 Oct 2024 10:32:54 -0700
Subject: [PATCH 03/41] Close #3199 Add "Make Latest" input to create release
 github actions workflow. (#3841)

---
 .github/workflows/create-release.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index f586cc40ec..529f1d7c6c 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -10,6 +10,11 @@ on:
         required: false
         default: false
         type: boolean
+      make_latest:
+        description: Should this be made the latest release?
+        required: false
+        default: false
+        type: boolean
 jobs:
   build:
     name: Upload Release Asset
@@ -56,10 +61,12 @@ jobs:
           tag_name: ${{ github.event.inputs.version }}
           name: ${{ github.event.inputs.version }}
           draft: false
+          make_latest: ${{ github.event.inputs.make_latest }}
           prerelease: ${{ github.event.inputs.pre_release }}
           files: |
             ./az_quickstart.zip
             ./az_quickstart.tar.gz
+
       - name: Remove version from info file
         run: |
           git config user.name github-actions
@@ -83,4 +90,4 @@ jobs:
           token: ${{ secrets.REPO_DISPATCH_TOKEN }}
           repository: ${{ matrix.repo }}
           event-type: az_quickstart_release
-          client-payload: '{"version": "${{ github.event.inputs.version }}"}'
+          client-payload: '{"version": "${{ github.event.inputs.version }}", "make_latest": "${{ github.event.inputs.make_latest }}"}'

From 82d999d8b3f6c00990b4380e85341db0a32071de Mon Sep 17 00:00:00 2001
From: tadean <51835841+tadean@users.noreply.github.com>
Date: Fri, 1 Nov 2024 10:39:52 -0700
Subject: [PATCH 04/41] Fixes #3852 Citation Style Group Rendering (#3853)

---
 composer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composer.json b/composer.json
index 267dd40908..416dc07887 100644
--- a/composer.json
+++ b/composer.json
@@ -215,6 +215,9 @@
             },
             "renanbr/bibtex-parser": {
                 "Parser performance issue": "https://gist.githubusercontent.com/tadean/39b90d00cd3edfff7c5653f907e15721/raw/8feb59cb4447b0f667fe5f4936a25c4d30211e1b/renanbr_bibtex_parser_performance.patch"
+            },
+            "seboettg/citeproc-php": {
+                "Group/label test chain issue (158)": "https://gist.githubusercontent.com/tadean/1d43d4bdf46d3157c50755621391c1df/raw/e5aa9846c1c2002dbd163d0a9dcbe7d462da8f19/issue_3852.patch"
             }
         },
         "drupal-scaffold": {

From 906fe145924fd5b5271b80016b2f101e6fdeb54a Mon Sep 17 00:00:00 2001
From: Chris Green <chrisgreen@arizona.edu>
Date: Fri, 1 Nov 2024 11:27:53 -0700
Subject: [PATCH 05/41] Close #3813 set default format to plain_text in
 flexible page summary field migration. (#3815)

---
 .../migrations/az_node_flexible_page.yml            | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/custom/az_migration/migrations/az_node_flexible_page.yml b/modules/custom/az_migration/migrations/az_node_flexible_page.yml
index 4ba246e938..cd85a27a49 100644
--- a/modules/custom/az_migration/migrations/az_node_flexible_page.yml
+++ b/modules/custom/az_migration/migrations/az_node_flexible_page.yml
@@ -34,8 +34,17 @@ process:
     source: field_uaqs_summary
     process:
       delta: delta
-      value: value
-      format: format
+      value:
+        -
+          plugin: callback
+          callable: strip_tags
+          source: value
+        -
+          plugin: callback
+          callable: html_entity_decode
+      format:
+        plugin: default_value
+        default_value: plain_text
 
   field_az_media_image:
     plugin: sub_process

From 9266c5166517a2e2e343d846d406c17ddae0f27a Mon Sep 17 00:00:00 2001
From: Dana Hertzberg <59745109+danahertzberg@users.noreply.github.com>
Date: Wed, 6 Nov 2024 12:43:31 -0500
Subject: [PATCH 06/41] Closes #3228: Change featured image to thumbnail image
 in Marketing Cloud layouts (#3847)

---
 modules/custom/az_marketing_cloud/az_marketing_cloud.module  | 5 ++++-
 ..._display.node.az_news.az_marketing_cloud_30_70_layout.yml | 4 ++--
 ..._display.node.az_news.az_marketing_cloud_50_50_layout.yml | 4 ++--
 ...e.az_news.az_marketing_cloud_50_50_layout_image_right.yml | 4 ++--
 ...e.az_news.az_marketing_cloud_70_30_layout_image_right.yml | 4 ++--
 ...w_display.node.az_news.az_marketing_cloud_hero_layout.yml | 4 ++--
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/modules/custom/az_marketing_cloud/az_marketing_cloud.module b/modules/custom/az_marketing_cloud/az_marketing_cloud.module
index b4084a75e0..a1bdf8c41b 100644
--- a/modules/custom/az_marketing_cloud/az_marketing_cloud.module
+++ b/modules/custom/az_marketing_cloud/az_marketing_cloud.module
@@ -138,7 +138,10 @@ function az_marketing_cloud_preprocess_node__view__az_marketing_cloud(&$variable
     $az_canonical_absolute_url = $az_canonical_url_object->setAbsolute()->toString();
     $variables['az_canonical_url'] = $az_canonical_absolute_url;
     $variables['az_canonical_summary_link_title'] = $token_service->replace('[node:az-canonical-summary-link-title]', ['node' => $node], [], $bubbleable_metadata);
-    $media = $node->field_az_media_image->entity ?? NULL;
+    $media = $node->field_az_media_thumbnail_image->entity ?? NULL;
+    if (empty($media)) {
+      $media = $node->field_az_media_image->entity ?? NULL;
+    }
     $file = $media->field_media_az_image->entity ?? NULL;
     if (!empty($file)) {
       $uri = $file->getFileUri();
diff --git a/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_30_70_layout.yml b/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_30_70_layout.yml
index f1ec3d99b9..a4cff1b8e0 100644
--- a/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_30_70_layout.yml
+++ b/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_30_70_layout.yml
@@ -49,7 +49,7 @@ content:
     third_party_settings: {  }
     weight: 3
     region: content
-  field_az_media_image:
+  field_az_media_thumbnail_image:
     type: entity_reference_label
     label: hidden
     settings:
@@ -78,7 +78,7 @@ hidden:
   field_az_expiration_date: true
   field_az_featured_image_as_thumb: true
   field_az_main_content: true
-  field_az_media_thumbnail_image: true
+  field_az_media_image: true
   field_az_metatag: true
   field_az_news_tags: true
   field_az_published: true
diff --git a/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_50_50_layout.yml b/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_50_50_layout.yml
index db60f1310b..051b0a265e 100644
--- a/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_50_50_layout.yml
+++ b/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_50_50_layout.yml
@@ -49,7 +49,7 @@ content:
     third_party_settings: {  }
     weight: 3
     region: content
-  field_az_media_image:
+  field_az_media_thumbnail_image:
     type: entity_reference_label
     label: hidden
     settings:
@@ -78,7 +78,7 @@ hidden:
   field_az_expiration_date: true
   field_az_featured_image_as_thumb: true
   field_az_main_content: true
-  field_az_media_thumbnail_image: true
+  field_az_media_image: true
   field_az_metatag: true
   field_az_news_tags: true
   field_az_published: true
diff --git a/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_50_50_layout_image_right.yml b/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_50_50_layout_image_right.yml
index 1627f74c07..f5c2f57a67 100644
--- a/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_50_50_layout_image_right.yml
+++ b/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_50_50_layout_image_right.yml
@@ -49,7 +49,7 @@ content:
     third_party_settings: {  }
     weight: 3
     region: content
-  field_az_media_image:
+  field_az_media_thumbnail_image:
     type: entity_reference_label
     label: hidden
     settings:
@@ -78,7 +78,7 @@ hidden:
   field_az_expiration_date: true
   field_az_featured_image_as_thumb: true
   field_az_main_content: true
-  field_az_media_thumbnail_image: true
+  field_az_media_image: true
   field_az_metatag: true
   field_az_news_tags: true
   field_az_published: true
diff --git a/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_70_30_layout_image_right.yml b/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_70_30_layout_image_right.yml
index 684e3fc2dd..253dac5c63 100644
--- a/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_70_30_layout_image_right.yml
+++ b/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_70_30_layout_image_right.yml
@@ -49,7 +49,7 @@ content:
     third_party_settings: {  }
     weight: 3
     region: content
-  field_az_media_image:
+  field_az_media_thumbnail_image:
     type: entity_reference_label
     label: hidden
     settings:
@@ -78,7 +78,7 @@ hidden:
   field_az_expiration_date: true
   field_az_featured_image_as_thumb: true
   field_az_main_content: true
-  field_az_media_thumbnail_image: true
+  field_az_media_image: true
   field_az_metatag: true
   field_az_news_tags: true
   field_az_published: true
diff --git a/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_hero_layout.yml b/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_hero_layout.yml
index d6a67abcd3..53b26f630c 100644
--- a/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_hero_layout.yml
+++ b/modules/custom/az_marketing_cloud/config/install/core.entity_view_display.node.az_news.az_marketing_cloud_hero_layout.yml
@@ -49,7 +49,7 @@ content:
     third_party_settings: {  }
     weight: 3
     region: content
-  field_az_media_image:
+  field_az_media_thumbnail_image:
     type: entity_reference_label
     label: hidden
     settings:
@@ -78,7 +78,7 @@ hidden:
   field_az_expiration_date: true
   field_az_featured_image_as_thumb: true
   field_az_main_content: true
-  field_az_media_thumbnail_image: true
+  field_az_media_image: true
   field_az_metatag: true
   field_az_news_tags: true
   field_az_published: true

From 26e686d42ffa4c264988e21239b2890a5e9c4890 Mon Sep 17 00:00:00 2001
From: Ryan Dool <ryanldool@gmail.com>
Date: Wed, 6 Nov 2024 15:34:31 -0500
Subject: [PATCH 07/41] Closes #1273 Closes #3848: Allow multiple select menus
 on the same page (#1387)

Co-authored-by: Dana Hertzberg <danahertzberg@arizona.edu>
Co-authored-by: Chris Green <chrisgreen@arizona.edu>
Co-authored-by: Joe Parsons <parsonsj@arizona.edu>
Co-authored-by: Troy Dean <tadean@arizona.edu>
---
 .../az_select_menu/js/az-select-menu.es6.js   | 78 ++++++++++---------
 .../az_select_menu/js/az-select-menu.js       | 78 ++++++++++---------
 .../src/Plugin/Block/AzSelectMenu.php         | 10 ++-
 .../templates/az-select-menu.html.twig        |  2 +-
 4 files changed, 87 insertions(+), 81 deletions(-)

diff --git a/modules/custom/az_select_menu/js/az-select-menu.es6.js b/modules/custom/az_select_menu/js/az-select-menu.es6.js
index 3fb537097c..b866de0607 100644
--- a/modules/custom/az_select_menu/js/az-select-menu.es6.js
+++ b/modules/custom/az_select_menu/js/az-select-menu.es6.js
@@ -8,45 +8,47 @@
     attach(context, settings) {
       //  az_select_menu form id's are added in an array depending
       //  on the page you are on, and how many select menus are on the page.
-      for (let i = 0; i < settings.azSelectMenu.ids.length; i++) {
-        const selectFormId = settings.azSelectMenu.ids[i];
-        const selectForm = document.querySelector(`#${selectFormId}`);
-        once('azSelectMenu', selectForm, context).forEach((element) => {
-          $(element).popover();
-          element.addEventListener('focus', (event) => {
-            Drupal.azSelectMenu.handleEvents(event);
+      Object.keys(settings.azSelectMenu.ids).forEach(function (property) {
+        if (settings.azSelectMenu.ids.hasOwnProperty(property)) {
+          const selectFormId = settings.azSelectMenu.ids[property];
+          const selectForm = document.querySelector(`#${selectFormId}`);
+          once('azSelectMenu', selectForm, context).forEach((element) => {
+            $(element).popover();
+            element.addEventListener('focus', (event) => {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            element.addEventListener('change', (event) => {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            element.addEventListener('mouseenter', (event) => {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            const button = element.querySelector('button');
+            button.addEventListener('click', (event) => {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            button.addEventListener('touchstart', (event) => {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            button.addEventListener('mouseenter', (event) => {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            button.addEventListener('mouseleave', (event) => {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            button.addEventListener('focus', (event) => {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            button.addEventListener('blur', (event) => {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            document.addEventListener('touchstart', (event) => {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            element.classList.add('processed');
           });
-          element.addEventListener('change', (event) => {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          element.addEventListener('mouseenter', (event) => {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          const button = element.querySelector('button');
-          button.addEventListener('click', (event) => {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          button.addEventListener('touchstart', (event) => {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          button.addEventListener('mouseenter', (event) => {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          button.addEventListener('mouseleave', (event) => {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          button.addEventListener('focus', (event) => {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          button.addEventListener('blur', (event) => {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          document.addEventListener('touchstart', (event) => {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          element.classList.add('processed');
-        });
-      }
+        }
+      });
     },
   };
 
diff --git a/modules/custom/az_select_menu/js/az-select-menu.js b/modules/custom/az_select_menu/js/az-select-menu.js
index 84b48f8447..bb7c4f948c 100644
--- a/modules/custom/az_select_menu/js/az-select-menu.js
+++ b/modules/custom/az_select_menu/js/az-select-menu.js
@@ -14,45 +14,47 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
   Drupal.azSelectMenu = Drupal.azSelectMenu || {};
   Drupal.behaviors.azSelectMenu = {
     attach: function attach(context, settings) {
-      for (var i = 0; i < settings.azSelectMenu.ids.length; i++) {
-        var selectFormId = settings.azSelectMenu.ids[i];
-        var selectForm = document.querySelector("#".concat(selectFormId));
-        once('azSelectMenu', selectForm, context).forEach(function (element) {
-          $(element).popover();
-          element.addEventListener('focus', function (event) {
-            Drupal.azSelectMenu.handleEvents(event);
+      Object.keys(settings.azSelectMenu.ids).forEach(function (property) {
+        if (settings.azSelectMenu.ids.hasOwnProperty(property)) {
+          var selectFormId = settings.azSelectMenu.ids[property];
+          var selectForm = document.querySelector("#".concat(selectFormId));
+          once('azSelectMenu', selectForm, context).forEach(function (element) {
+            $(element).popover();
+            element.addEventListener('focus', function (event) {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            element.addEventListener('change', function (event) {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            element.addEventListener('mouseenter', function (event) {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            var button = element.querySelector('button');
+            button.addEventListener('click', function (event) {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            button.addEventListener('touchstart', function (event) {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            button.addEventListener('mouseenter', function (event) {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            button.addEventListener('mouseleave', function (event) {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            button.addEventListener('focus', function (event) {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            button.addEventListener('blur', function (event) {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            document.addEventListener('touchstart', function (event) {
+              Drupal.azSelectMenu.handleEvents(event);
+            });
+            element.classList.add('processed');
           });
-          element.addEventListener('change', function (event) {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          element.addEventListener('mouseenter', function (event) {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          var button = element.querySelector('button');
-          button.addEventListener('click', function (event) {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          button.addEventListener('touchstart', function (event) {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          button.addEventListener('mouseenter', function (event) {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          button.addEventListener('mouseleave', function (event) {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          button.addEventListener('focus', function (event) {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          button.addEventListener('blur', function (event) {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          document.addEventListener('touchstart', function (event) {
-            Drupal.azSelectMenu.handleEvents(event);
-          });
-          element.classList.add('processed');
-        });
-      }
+        }
+      });
     }
   };
   Drupal.azSelectMenu.handleEvents = function (event) {
diff --git a/modules/custom/az_select_menu/src/Plugin/Block/AzSelectMenu.php b/modules/custom/az_select_menu/src/Plugin/Block/AzSelectMenu.php
index cc1950c03f..13992c6a9d 100644
--- a/modules/custom/az_select_menu/src/Plugin/Block/AzSelectMenu.php
+++ b/modules/custom/az_select_menu/src/Plugin/Block/AzSelectMenu.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\az_select_menu\Plugin\Block;
 
+use Drupal\Component\Utility\Html;
 use Drupal\Core\Block\Attribute\Block;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
@@ -129,9 +130,10 @@ public function blockSubmit($form, FormStateInterface $form_state) {
   public function build() {
 
     $build = parent::build();
+    $menu_name = Html::getUniqueId('az-' . $build['#menu_name']);
 
     $form_attributes = new Attribute([
-      'id' => 'az-select-menu-' . $build['#menu_name'] . '-form',
+      'id' => $menu_name . '-form',
       'data-toggle' => 'popover',
       'data-trigger' => 'focus',
       'data-placement' => 'top',
@@ -141,7 +143,7 @@ public function build() {
     $build['#form_attributes'] = $form_attributes;
 
     $select_attributes = new Attribute([
-      'id' => 'az-select-menu-' . $build['#menu_name'] . '-select',
+      'id' => $menu_name . '-select',
       'class' => [
         'form-control',
         'select-primary',
@@ -152,7 +154,7 @@ public function build() {
     $build['#select_attributes'] = $select_attributes;
 
     $button_attributes = new Attribute([
-      'id' => 'az-select-menu-' . $build['#menu_name'] . '-button',
+      'id' => $menu_name . '-button',
       'class' => [
         'btn',
         'btn-primary',
@@ -168,7 +170,7 @@ public function build() {
     $build['#button_attributes'] = $button_attributes;
 
     $build['#attached']['library'][] = 'az_select_menu/az_select_menu';
-    $build['#attached']['drupalSettings']['azSelectMenu']['ids'][] = 'az-select-menu-' . $build['#menu_name'] . '-form';
+    $build['#attached']['drupalSettings']['azSelectMenu']['ids'][$menu_name] = $menu_name . '-form';
 
     return $build;
   }
diff --git a/modules/custom/az_select_menu/templates/az-select-menu.html.twig b/modules/custom/az_select_menu/templates/az-select-menu.html.twig
index 881f090eab..c966f24967 100644
--- a/modules/custom/az_select_menu/templates/az-select-menu.html.twig
+++ b/modules/custom/az_select_menu/templates/az-select-menu.html.twig
@@ -54,7 +54,7 @@
               <div class="select-menu-label">{{menu_block_configuration.az_select_menu.preform_text}}</div>
             </span>
           {% endif %}
-          <label class="sr-only select-menu-label-sr">{{menu_block_configuration.az_select_menu.preform_text_sr_only}}</label>
+          <label class="sr-only select-menu-label-sr" for="{{ select_attributes.id }}">{{menu_block_configuration.az_select_menu.preform_text_sr_only}}</label>
           {% import _self as menus %}
           {% if items %}
             <select {{ select_attributes }}>

From b02ca30dc4f40744d5901ea74c157729b1d16271 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Nov 2024 10:09:46 -0700
Subject: [PATCH 08/41] Update citation-style-language/locales requirement from
 0.0.22 to 0.0.23 (#3801)

Updates the requirements on [citation-style-language/locales](https://github.com/citation-style-language/locales) to permit the latest version.
- [Release notes](https://github.com/citation-style-language/locales/releases)
- [Commits](https://github.com/citation-style-language/locales/compare/v0.0.22...v0.0.23)

---
updated-dependencies:
- dependency-name: citation-style-language/locales
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 416dc07887..1dd82c88bb 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
         "php": ">=8.1",
         "az-digital/arizona-bootstrap": "2.0.27",
         "az-digital/az-icons": "1.0.2",
-        "citation-style-language/locales": "0.0.22",
+        "citation-style-language/locales": "0.0.23",
         "citation-style-language/styles": "0.0.561",
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.7",

From b955036368610251dbaa8712d49712ce5621973f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Nov 2024 10:10:43 -0700
Subject: [PATCH 09/41] Update drupal/blazy requirement from 3.0.12 to 3.0.13
 (#3819)

Updates the requirements on drupal/blazy to permit the latest version.

---
updated-dependencies:
- dependency-name: drupal/blazy
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 1dd82c88bb..31ff8414c7 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
         "drupal/asset_injector": "2.21.0",
         "drupal/auto_entitylabel": "3.3.0",
         "drupal/better_exposed_filters": "7.0.2",
-        "drupal/blazy": "3.0.12",
+        "drupal/blazy": "3.0.13",
         "drupal/block_class": "2.0.11",
         "drupal/block_field": "1.0.0-rc5",
         "drupal/bootstrap_barrio": "5.1.12",

From 53ee00035e9ff6ae119cdf2065846ac4040eb289 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Nov 2024 09:38:48 -0700
Subject: [PATCH 10/41] Update citation-style-language/styles requirement from
 0.0.561 to 0.0.564 (#3860)

Update citation-style-language/styles requirement
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 31ff8414c7..b478f947b4 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "az-digital/arizona-bootstrap": "2.0.27",
         "az-digital/az-icons": "1.0.2",
         "citation-style-language/locales": "0.0.23",
-        "citation-style-language/styles": "0.0.561",
+        "citation-style-language/styles": "0.0.564",
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.7",
         "drupal/anchor_link": "3.0.0-beta1",

From ed1d88a85186ff66fbda6a9bac8192ad7d3be149 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Nov 2024 10:10:17 -0700
Subject: [PATCH 11/41] Update drupal/views_bulk_operations requirement from
 4.3.0 to 4.3.2 (#3873)

Updates the requirements on drupal/views_bulk_operations to permit the latest version.

---
updated-dependencies:
- dependency-name: drupal/views_bulk_operations
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index b478f947b4..8422e5a771 100644
--- a/composer.json
+++ b/composer.json
@@ -115,7 +115,7 @@
         "drupal/smtp": "1.4.0",
         "drupal/token": "1.15.0",
         "drupal/views_bootstrap": "5.4.1",
-        "drupal/views_bulk_operations": "4.3.0",
+        "drupal/views_bulk_operations": "4.3.2",
         "drupal/views_remote_data": "1.0.3",
         "drupal/viewsreference": "2.0.0-beta10",
         "drupal/webform": "6.2.7",

From d487d7124f7dc5c11450f3f8cc07ad1f5f3219e2 Mon Sep 17 00:00:00 2001
From: tadean <51835841+tadean@users.noreply.github.com>
Date: Fri, 15 Nov 2024 10:18:05 -0700
Subject: [PATCH 12/41] Fixes #3874 Modules using Configuration Overrides
 should declare az_core dependency (#3875)

---
 .../az_digital_asset_library/az_digital_asset_library.info.yml   | 1 +
 modules/custom/az_finder/az_finder.info.yml                      | 1 +
 modules/custom/az_google_tag/az_google_tag.info.yml              | 1 +
 modules/custom/az_seo/az_seo.info.yml                            | 1 +
 4 files changed, 4 insertions(+)

diff --git a/modules/custom/az_digital_asset_library/az_digital_asset_library.info.yml b/modules/custom/az_digital_asset_library/az_digital_asset_library.info.yml
index 376bce17ba..69d7266258 100644
--- a/modules/custom/az_digital_asset_library/az_digital_asset_library.info.yml
+++ b/modules/custom/az_digital_asset_library/az_digital_asset_library.info.yml
@@ -6,5 +6,6 @@ package: 'The University of Arizona - Experimental'
 lifecycle: experimental
 lifecycle_link: 'https://github.com/az-digital/az_quickstart/blob/main/RELEASES.md#experimental-features'
 dependencies:
+  - az_core
   - ib_dam:ib_dam
   - ib_dam:ib_dam_media
diff --git a/modules/custom/az_finder/az_finder.info.yml b/modules/custom/az_finder/az_finder.info.yml
index 881516b383..6ae66565d4 100644
--- a/modules/custom/az_finder/az_finder.info.yml
+++ b/modules/custom/az_finder/az_finder.info.yml
@@ -6,5 +6,6 @@ package: 'The University of Arizona - Experimental'
 lifecycle: experimental
 lifecycle_link: 'https://github.com/az-digital/az_quickstart/blob/main/RELEASES.md#experimental-features'
 dependencies:
+  - az_core
   - better_exposed_filters:better_exposed_filters
 configure: az_finder.settings
diff --git a/modules/custom/az_google_tag/az_google_tag.info.yml b/modules/custom/az_google_tag/az_google_tag.info.yml
index 0dd9e81668..7e76eba1d2 100644
--- a/modules/custom/az_google_tag/az_google_tag.info.yml
+++ b/modules/custom/az_google_tag/az_google_tag.info.yml
@@ -3,4 +3,5 @@ type: module
 core_version_requirement: ^9 || ^10
 package: The University of Arizona
 dependencies:
+  - az_core
   - google_tag:google_tag
diff --git a/modules/custom/az_seo/az_seo.info.yml b/modules/custom/az_seo/az_seo.info.yml
index e06b602d3d..6bfecb0c5e 100644
--- a/modules/custom/az_seo/az_seo.info.yml
+++ b/modules/custom/az_seo/az_seo.info.yml
@@ -3,6 +3,7 @@ type: module
 core_version_requirement: ^9 || ^10
 package: The University of Arizona
 dependencies:
+  - az_core
   - xmlsitemap:xmlsitemap
   - xmlsitemap:xmlsitemap_engines
   - redirect:redirect

From 88cf30841de78fff9f3094b699892b480c4cde21 Mon Sep 17 00:00:00 2001
From: tadean <51835841+tadean@users.noreply.github.com>
Date: Fri, 15 Nov 2024 10:22:02 -0700
Subject: [PATCH 13/41] Fixes #3823 Card Widget Deprecation Notices (#3864)

---
 .../az_card/src/Plugin/Field/FieldWidget/AZCardWidget.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/custom/az_card/src/Plugin/Field/FieldWidget/AZCardWidget.php b/modules/custom/az_card/src/Plugin/Field/FieldWidget/AZCardWidget.php
index df2fb8983a..3f3aee4edf 100644
--- a/modules/custom/az_card/src/Plugin/Field/FieldWidget/AZCardWidget.php
+++ b/modules/custom/az_card/src/Plugin/Field/FieldWidget/AZCardWidget.php
@@ -170,7 +170,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
 
       // Check and see if there's a valid link to preview.
       if ($item->link_title || $item->link_uri) {
-        if (str_starts_with($item->link_uri, '/' . PublicStream::basePath())) {
+        if (!empty($item->link_uri) && str_starts_with($item->link_uri, '/' . PublicStream::basePath())) {
           // Link to public file: use fromUri() to get the URL.
           $link_url = Url::fromUri(urldecode('base:' . $item->link_uri));
         }

From fb9fdd8f41c28727efa6b887d0c450fa3a284800 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Nov 2024 12:15:01 -0700
Subject: [PATCH 14/41] Update drupal/smart_date requirement from 4.1.6 to
 4.2.1 (#3878)

* Update drupal/smart_date requirement from 4.1.6 to 4.2.0

Updates the requirements on drupal/smart_date to permit the latest version.

---
updated-dependencies:
- dependency-name: drupal/smart_date
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update composer.json with latest release

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Brian Berndt <74572157+bberndt-uaz@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8422e5a771..ee0630217e 100644
--- a/composer.json
+++ b/composer.json
@@ -110,7 +110,7 @@
         "drupal/seckit": "2.0.3",
         "drupal/slick": "3.0.4",
         "drupal/slick_views": "3.0.3",
-        "drupal/smart_date": "4.1.6",
+        "drupal/smart_date": "4.2.1",
         "drupal/smart_title": "1.0.0",
         "drupal/smtp": "1.4.0",
         "drupal/token": "1.15.0",

From c1e5508b41efde162aa47e3b97423e141037a012 Mon Sep 17 00:00:00 2001
From: Brian Berndt <74572157+bberndt-uaz@users.noreply.github.com>
Date: Mon, 18 Nov 2024 15:15:47 -0700
Subject: [PATCH 15/41] Closes #3870 Revert #3219: Add anchor link plugin for
 CKEditor5 (#3872)

---
 composer.json                                  |  2 --
 .../az_paragraphs/az_paragraphs.info.yml       |  1 -
 .../custom/az_paragraphs/az_paragraphs.install |  3 +--
 .../custom/az_paragraphs/az_paragraphs.module  | 18 ------------------
 .../optional/editor.editor.az_standard.yml     |  1 -
 5 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/composer.json b/composer.json
index ee0630217e..eee6d7a170 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,6 @@
         "citation-style-language/styles": "0.0.564",
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.7",
-        "drupal/anchor_link": "3.0.0-beta1",
         "drupal/access_unpublished": "1.6.0",
         "drupal/antibot": "2.0.4",
         "drupal/asset_injector": "2.21.0",
@@ -127,7 +126,6 @@
         "npm-asset/bootstrap-datepicker": "1.10.0",
         "npm-asset/easepick--bundle": "1.2.1",
         "npm-asset/jquery-ui-touch-punch": "*",
-        "npm-asset/northernco--ckeditor5-anchor-drupal": "0.5.0",
         "npm-asset/slick-carousel": "1.8.0",
         "renanbr/bibtex-parser": "2.2.0",
         "seboettg/citeproc-php": "2.6.2"
diff --git a/modules/custom/az_paragraphs/az_paragraphs.info.yml b/modules/custom/az_paragraphs/az_paragraphs.info.yml
index 8ef7def13e..e91c33d57f 100644
--- a/modules/custom/az_paragraphs/az_paragraphs.info.yml
+++ b/modules/custom/az_paragraphs/az_paragraphs.info.yml
@@ -5,7 +5,6 @@ core_version_requirement: ^9 || ^10
 package: 'The University of Arizona'
 dependencies:
   - paragraphs:paragraphs
-  - anchor_link:anchor_link
   - az_card
   - az_core
   - az_media
diff --git a/modules/custom/az_paragraphs/az_paragraphs.install b/modules/custom/az_paragraphs/az_paragraphs.install
index 67043aeadf..15cbd0f31e 100644
--- a/modules/custom/az_paragraphs/az_paragraphs.install
+++ b/modules/custom/az_paragraphs/az_paragraphs.install
@@ -92,8 +92,7 @@ function az_paragraphs_update_1021001() {
 }
 
 /**
- * Enable anchor_link module for CKEditor5 by default.
+ * Empty update since we reverted our addition of the anchor_link module.
  */
 function az_paragraphs_update_1021201() {
-  \Drupal::service('module_installer')->install(['anchor_link']);
 }
diff --git a/modules/custom/az_paragraphs/az_paragraphs.module b/modules/custom/az_paragraphs/az_paragraphs.module
index 9c9aeb27e4..0c0eb26290 100644
--- a/modules/custom/az_paragraphs/az_paragraphs.module
+++ b/modules/custom/az_paragraphs/az_paragraphs.module
@@ -53,21 +53,3 @@ function az_paragraphs_theme_registry_alter(&$theme_registry) {
     }
   }
 }
-
-/**
- * Implements hook_library_info_alter().
- *
- * Alter path of CKE5 anchor link library to match the one installed by
- * composer.
- * @link https://www.drupal.org/project/anchor_link/issues/3406349#comment-15463373
- */
-function az_paragraphs_library_info_alter(&$libraries, $extension) {
-  if ($extension === 'anchor_link' && isset($libraries['cke5_anchor_link'])) {
-    $libraries['cke5_anchor_link']['js'] = [
-      '/libraries/northernco--ckeditor5-anchor-drupal/build/anchor-drupal.js' => [
-        'preprocess' => FALSE,
-        'minified' => TRUE,
-      ],
-    ];
-  }
-}
diff --git a/modules/custom/az_paragraphs/config/optional/editor.editor.az_standard.yml b/modules/custom/az_paragraphs/config/optional/editor.editor.az_standard.yml
index d9ee1f55d6..dbc9fb0b47 100644
--- a/modules/custom/az_paragraphs/config/optional/editor.editor.az_standard.yml
+++ b/modules/custom/az_paragraphs/config/optional/editor.editor.az_standard.yml
@@ -21,7 +21,6 @@ settings:
       - specialCharacters
       - '|'
       - link
-      - anchor
       - '|'
       - bulletedList
       - numberedList

From ea1f77811b43d6f7434e33cdc7d928ba8b541643 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2024 15:51:31 -0700
Subject: [PATCH 16/41] Update drupal/block_class requirement from 2.0.11 to
 4.0.0 (#3858)

Updates the requirements on drupal/block_class to permit the latest version.

---
updated-dependencies:
- dependency-name: drupal/block_class
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index eee6d7a170..f4461cc994 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
         "drupal/auto_entitylabel": "3.3.0",
         "drupal/better_exposed_filters": "7.0.2",
         "drupal/blazy": "3.0.13",
-        "drupal/block_class": "2.0.11",
+        "drupal/block_class": "4.0.0",
         "drupal/block_field": "1.0.0-rc5",
         "drupal/bootstrap_barrio": "5.1.12",
         "drupal/bootstrap_utilities": "3.0.1",

From a5e2043d2e4b351bcc91b1f371753965279c749a Mon Sep 17 00:00:00 2001
From: Chris Green <chrisgreen@arizona.edu>
Date: Mon, 18 Nov 2024 16:48:37 -0700
Subject: [PATCH 17/41] Close #3861 Change scope of spaceless filter from all
 elements to AZ Person headings (#3867)

Co-authored-by: Brian Berndt <bberndt@email.arizona.edu>
---
 modules/custom/az_person/az_person.module     | 14 +++++++++
 ...tml-element--node--az-person--h1.html.twig |  4 +--
 ...tml-element--node--az-person--h2.html.twig | 29 +++++++++++++++++++
 ...tml-element--node--az-person--h3.html.twig | 29 +++++++++++++++++++
 4 files changed, 74 insertions(+), 2 deletions(-)
 rename themes/custom/az_barrio/templates/field_group/field-group-html-element.html.twig => modules/custom/az_person/templates/field-group-html-element--node--az-person--h1.html.twig (85%)
 create mode 100644 modules/custom/az_person/templates/field-group-html-element--node--az-person--h2.html.twig
 create mode 100644 modules/custom/az_person/templates/field-group-html-element--node--az-person--h3.html.twig

diff --git a/modules/custom/az_person/az_person.module b/modules/custom/az_person/az_person.module
index 4b70c25c5e..5976efac6b 100644
--- a/modules/custom/az_person/az_person.module
+++ b/modules/custom/az_person/az_person.module
@@ -61,3 +61,17 @@ function az_person_preprocess_field(array &$variables) {
     }
   }
 }
+
+/**
+ * Implements hook_theme().
+ */
+function az_person_theme() {
+  $base_hook = [
+    'base hook' => 'field_group_html_element',
+  ];
+  return [
+    'field_group_html_element__node__az_person__h1' => $base_hook,
+    'field_group_html_element__node__az_person__h2' => $base_hook,
+    'field_group_html_element__node__az_person__h3' => $base_hook,
+  ];
+}
diff --git a/themes/custom/az_barrio/templates/field_group/field-group-html-element.html.twig b/modules/custom/az_person/templates/field-group-html-element--node--az-person--h1.html.twig
similarity index 85%
rename from themes/custom/az_barrio/templates/field_group/field-group-html-element.html.twig
rename to modules/custom/az_person/templates/field-group-html-element--node--az-person--h1.html.twig
index ca4e9fa027..549fef935c 100644
--- a/themes/custom/az_barrio/templates/field_group/field-group-html-element.html.twig
+++ b/modules/custom/az_person/templates/field-group-html-element--node--az-person--h1.html.twig
@@ -1,13 +1,13 @@
 {#
 /**
  * @file
- * Default theme implementation for a fieldgroup html element.
+ * Theme override for a fieldgroup html element.
  *
  * Available variables:
  * - title: Title of the group.
  * - title_element: Element to wrap the title.
  * - children: The children of the group.
- * - wrapper_element: The html element to use
+ * - wrapper_element: The html element to use.
  * - attributes: A list of HTML attributes for the group wrapper.
  *
  * @see template_preprocess_field_group_html_element()
diff --git a/modules/custom/az_person/templates/field-group-html-element--node--az-person--h2.html.twig b/modules/custom/az_person/templates/field-group-html-element--node--az-person--h2.html.twig
new file mode 100644
index 0000000000..549fef935c
--- /dev/null
+++ b/modules/custom/az_person/templates/field-group-html-element--node--az-person--h2.html.twig
@@ -0,0 +1,29 @@
+{#
+/**
+ * @file
+ * Theme override for a fieldgroup html element.
+ *
+ * Available variables:
+ * - title: Title of the group.
+ * - title_element: Element to wrap the title.
+ * - children: The children of the group.
+ * - wrapper_element: The html element to use.
+ * - attributes: A list of HTML attributes for the group wrapper.
+ *
+ * @see template_preprocess_field_group_html_element()
+ *
+ * @ingroup themeable
+ */
+#}
+<{{ wrapper_element }} {{ attributes }}>
+{% if title %}
+  <{{ title_element }}{{ title_attributes }}>{{ title }}</{{ title_element }}>
+{% endif %}
+{% if collapsible %}
+  <div class="field-group-wrapper">
+{% endif %}
+{% apply spaceless %}{{children}}{% endapply %}
+{% if collapsible %}
+  </div>
+{% endif %}
+</{{ wrapper_element }}>
diff --git a/modules/custom/az_person/templates/field-group-html-element--node--az-person--h3.html.twig b/modules/custom/az_person/templates/field-group-html-element--node--az-person--h3.html.twig
new file mode 100644
index 0000000000..549fef935c
--- /dev/null
+++ b/modules/custom/az_person/templates/field-group-html-element--node--az-person--h3.html.twig
@@ -0,0 +1,29 @@
+{#
+/**
+ * @file
+ * Theme override for a fieldgroup html element.
+ *
+ * Available variables:
+ * - title: Title of the group.
+ * - title_element: Element to wrap the title.
+ * - children: The children of the group.
+ * - wrapper_element: The html element to use.
+ * - attributes: A list of HTML attributes for the group wrapper.
+ *
+ * @see template_preprocess_field_group_html_element()
+ *
+ * @ingroup themeable
+ */
+#}
+<{{ wrapper_element }} {{ attributes }}>
+{% if title %}
+  <{{ title_element }}{{ title_attributes }}>{{ title }}</{{ title_element }}>
+{% endif %}
+{% if collapsible %}
+  <div class="field-group-wrapper">
+{% endif %}
+{% apply spaceless %}{{children}}{% endapply %}
+{% if collapsible %}
+  </div>
+{% endif %}
+</{{ wrapper_element }}>

From 78e69a0815ddb9184d9389d8a425abc1c521faef Mon Sep 17 00:00:00 2001
From: Brian Berndt <74572157+bberndt-uaz@users.noreply.github.com>
Date: Mon, 18 Nov 2024 16:51:30 -0700
Subject: [PATCH 18/41] Closes #3863 Update Global Footer Links (#3871)

Co-authored-by: Joe Parsons <471936+joeparsons@users.noreply.github.com>
---
 .../az_global_footer/az_global_footer.install | 107 ++++++++++++++++++
 .../data/az_global_footer.json                |  30 ++---
 2 files changed, 122 insertions(+), 15 deletions(-)

diff --git a/modules/custom/az_global_footer/az_global_footer.install b/modules/custom/az_global_footer/az_global_footer.install
index f1918037b8..64cf806dcc 100644
--- a/modules/custom/az_global_footer/az_global_footer.install
+++ b/modules/custom/az_global_footer/az_global_footer.install
@@ -221,3 +221,110 @@ function az_global_footer_update_1020901() {
 
   return t('Updated %count UAlert menu link(s) in the global footer.', ['%count' => $updated_count]);
 }
+
+/**
+ * Make three updates to global footer links (az_quickstart #3863).
+ */
+function az_global_footer_update_1021101() {
+
+  // Update the URL for the Annual Security Report link.
+  $asr_updates = 0;
+  $menu_link_content_ids = \Drupal::entityQuery('menu_link_content')
+    ->accessCheck(FALSE)
+    ->condition('menu_name', 'az-footer-main')
+    ->condition('title', 'Annual Security Report')
+    ->condition('link__uri', 'https://clery.arizona.edu/annual-reports')
+    ->execute();
+  foreach ($menu_link_content_ids as $id) {
+    /** @var \Drupal\menu_link_content\Entity\MenuLinkContent $menu_link_content */
+    $menu_link_content = MenuLinkContent::load($id);
+    if ($menu_link_content !== NULL) {
+      /* @phpstan-ignore-next-line */
+      $menu_link_content->link->uri = 'https://clery.arizona.edu/asr';
+      $menu_link_content->save();
+      $asr_updates++;
+    }
+  }
+
+  // Delete the Outreach & Extension link and find the weight of the Athletics
+  // & Recreation link so the Campus Store link can be added directly below it.
+  // Also save the Campus Store link ID if it already exists.
+  $athletics_link_weight = NULL;
+  $outreach_link_ids = [];
+  $campus_store_link_id = NULL;
+  $topics_menu_ids = \Drupal::entityQuery('menu_link_content')
+    ->accessCheck(FALSE)
+    ->condition('menu_name', 'az-footer-topics')
+    ->execute();
+  foreach ($topics_menu_ids as $id) {
+    /** @var \Drupal\menu_link_content\Entity\MenuLinkContent $menu_link_content */
+    $menu_link_content = MenuLinkContent::load($id);
+    if ($menu_link_content !== NULL) {
+      if ($menu_link_content->getTitle() === 'Outreach & Extension' && $menu_link_content->getUrlObject()->toString() === 'https://uaforyou.arizona.edu') {
+        $outreach_link_ids[] = $id;
+        $menu_link_content->delete();
+      }
+      elseif ($menu_link_content->getTitle() === 'Athletics & Recreation' && $menu_link_content->getUrlObject()->toString() === 'https://www.arizona.edu/athletics-recreation' && $menu_link_content->isEnabled()) {
+        $athletics_link_weight = $menu_link_content->getWeight();
+      }
+      elseif ($menu_link_content->getTitle() === 'Campus Store') {
+        $campus_store_link_id = $id;
+      }
+    }
+  }
+
+  // Skip creating the Campus Store link if it already exists.
+  if (isset($campus_store_link_id)) {
+    return t('Updated %asr Annual Security Report menu link(s) in Footer - Main. Deleted %outreach Outreach & Extension menu link(s) in Footer - Topics. Campus Store link not created: link already exists in Footer - Topics.',
+      [
+        '%asr' => $asr_updates,
+        '%outreach' => count($outreach_link_ids),
+      ]);
+  }
+
+  // Skip creating the Campus Store link if Athletics & Recreation is missing.
+  if (!isset($athletics_link_weight)) {
+    return t('Updated %asr Annual Security Report menu link(s) in Footer - Main. Deleted %outreach Outreach & Extension menu link(s) in Footer - Topics. Campus Store link not created: no Athletics & Recreation link found in Footer - Topics.',
+      [
+        '%asr' => $asr_updates,
+        '%outreach' => count($outreach_link_ids),
+      ]);
+  }
+
+  // Remove the deleted Outreach & Extension link ID(s) for the next step.
+  if (!empty($outreach_link_ids)) {
+    foreach ($outreach_link_ids as $deleted_id) {
+      unset($topics_menu_ids[$deleted_id]);
+    }
+  }
+
+  // Update the weights of links to create a space for the Campus Store link.
+  foreach ($topics_menu_ids as $id) {
+    /** @var \Drupal\menu_link_content\Entity\MenuLinkContent $menu_link_content */
+    $menu_link_content = MenuLinkContent::load($id);
+    if ($menu_link_content !== NULL) {
+      $weight = $menu_link_content->getWeight();
+      if ($menu_link_content->getWeight() > $athletics_link_weight) {
+        $menu_link_content->set('weight', ++$weight);
+        $menu_link_content->save();
+      }
+    }
+  }
+
+  // Create the Campus Store link.
+  $menu_link = MenuLinkContent::create([
+    'title' => 'Campus Store',
+    'link' => ['uri' => 'https://shop.arizona.edu/', 'title' => NULL],
+    'menu_name' => 'az-footer-topics',
+    'expanded' => FALSE,
+    'external' => TRUE,
+    'weight' => ++$athletics_link_weight,
+  ]);
+  $menu_link->save();
+
+  return t('Updated %asr Annual Security Report menu link(s) in Footer - Main. Deleted %outreach Outreach & Extension menu link(s) in Footer - Topics. Created 1 Campus Store link in Footer - Topics.',
+  [
+    '%asr' => $asr_updates,
+    '%outreach' => count($outreach_link_ids),
+  ]);
+}
diff --git a/modules/custom/az_global_footer/data/az_global_footer.json b/modules/custom/az_global_footer/data/az_global_footer.json
index 380cd03625..0d874345d0 100644
--- a/modules/custom/az_global_footer/data/az_global_footer.json
+++ b/modules/custom/az_global_footer/data/az_global_footer.json
@@ -49,7 +49,7 @@
       "parent_link_id": "0",
       "menu": "az-footer-main",
       "title": "Annual Security Report",
-      "urlpath": "https://clery.arizona.edu/annual-reports",
+      "urlpath": "https://clery.arizona.edu/asr",
       "external": true,
       "expanded": false,
       "enabled": true,
@@ -213,8 +213,8 @@
       "link_id": "20",
       "parent_link_id": "0",
       "menu": "az-footer-topics",
-      "title": "Colleges, Schools, Departments",
-      "urlpath": "https://www.arizona.edu/colleges-schools",
+      "title": "Campus Store",
+      "urlpath": "https://shop.arizona.edu/",
       "external": true,
       "expanded": false,
       "enabled": true,
@@ -224,8 +224,8 @@
       "link_id": "21",
       "parent_link_id": "0",
       "menu": "az-footer-topics",
-      "title": "Diversity",
-      "urlpath": "https://diversity.arizona.edu",
+      "title": "Colleges, Schools, Departments",
+      "urlpath": "https://www.arizona.edu/colleges-schools",
       "external": true,
       "expanded": false,
       "enabled": true,
@@ -235,8 +235,8 @@
       "link_id": "22",
       "parent_link_id": "0",
       "menu": "az-footer-topics",
-      "title": "Environment & Sustainability",
-      "urlpath": "https://www.environment.arizona.edu",
+      "title": "Diversity",
+      "urlpath": "https://diversity.arizona.edu",
       "external": true,
       "expanded": false,
       "enabled": true,
@@ -246,8 +246,8 @@
       "link_id": "23",
       "parent_link_id": "0",
       "menu": "az-footer-topics",
-      "title": "International Engagement",
-      "urlpath": "https://international.arizona.edu",
+      "title": "Environment & Sustainability",
+      "urlpath": "https://www.environment.arizona.edu",
       "external": true,
       "expanded": false,
       "enabled": true,
@@ -257,8 +257,8 @@
       "link_id": "24",
       "parent_link_id": "0",
       "menu": "az-footer-topics",
-      "title": "Health & Medical",
-      "urlpath": "https://www.arizona.edu/health-sciences",
+      "title": "International Engagement",
+      "urlpath": "https://international.arizona.edu",
       "external": true,
       "expanded": false,
       "enabled": true,
@@ -268,8 +268,8 @@
       "link_id": "25",
       "parent_link_id": "0",
       "menu": "az-footer-topics",
-      "title": "Libraries",
-      "urlpath": "https://www.arizona.edu/libraries",
+      "title": "Health & Medical",
+      "urlpath": "https://www.arizona.edu/health-sciences",
       "external": true,
       "expanded": false,
       "enabled": true,
@@ -279,8 +279,8 @@
       "link_id": "26",
       "parent_link_id": "0",
       "menu": "az-footer-topics",
-      "title": "Outreach & Extension",
-      "urlpath": "https://uaforyou.arizona.edu",
+      "title": "Libraries",
+      "urlpath": "https://www.arizona.edu/libraries",
       "external": true,
       "expanded": false,
       "enabled": true,

From 80ece0d35a0478bdbb52ae8010f456455a63794d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2024 17:32:27 -0700
Subject: [PATCH 19/41] Update drupal/jquery_ui_datepicker requirement from
 2.1.0 to 2.1.1 (#3881)

Updates the requirements on drupal/jquery_ui_datepicker to permit the latest version.

---
updated-dependencies:
- dependency-name: drupal/jquery_ui_datepicker
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index f4461cc994..0181c2dcb3 100644
--- a/composer.json
+++ b/composer.json
@@ -82,7 +82,7 @@
         "drupal/inline_entity_form": "3.0.0-rc20",
         "drupal/intelligencebank": "4.1.1",
         "drupal/jquery_ui": "1.7.0",
-        "drupal/jquery_ui_datepicker": "2.1.0",
+        "drupal/jquery_ui_datepicker": "2.1.1",
         "drupal/jquery_ui_slider": "*",
         "drupal/jquery_ui_touch_punch": "*",
         "drupal/link_class": "2.1.0",

From 24cb99e34c7111aa0edbc874045bee4224bdb866 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2024 17:32:47 -0700
Subject: [PATCH 20/41] Update drupal/coffee requirement from 1.4.0 to 2.0.0
 (#3877)

Updates the requirements on drupal/coffee to permit the latest version.

---
updated-dependencies:
- dependency-name: drupal/coffee
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 0181c2dcb3..8d01e21bb6 100644
--- a/composer.json
+++ b/composer.json
@@ -50,7 +50,7 @@
         "drupal/chosen": "4.0.3",
         "drupal/ckeditor_bs_grid": "2.0.12",
         "drupal/ckeditor_indentblock": "1.0",
-        "drupal/coffee": "1.4.0",
+        "drupal/coffee": "2.0.0",
         "drupal/config_distro": "2.0.0-alpha2",
         "drupal/config_ignore": "3.3.0",
         "drupal/config_ignore_readonly": "2.2.0",

From 754973eb55a46f0cec2df07cc8c0d1b2a5eb6f4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Nov 2024 14:48:51 -0700
Subject: [PATCH 21/41] Update drupal/field_group_link requirement from 3.1.0
 to 3.2.0 (#3885)

Updates the requirements on drupal/field_group_link to permit the latest version.

---
updated-dependencies:
- dependency-name: drupal/field_group_link
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8d01e21bb6..47c9daa259 100644
--- a/composer.json
+++ b/composer.json
@@ -73,7 +73,7 @@
         "drupal/externalauth": "2.0.6",
         "drupal/extlink": "2.0.2",
         "drupal/field_group": "3.6.0",
-        "drupal/field_group_link": "3.1.0",
+        "drupal/field_group_link": "3.2.0",
         "drupal/flag": "4.0.0-beta5",
         "drupal/google_tag": "2.0.6",
         "drupal/honeypot": "2.1.4",

From d2d0dc26d0fda535c2a68e7fa9cd0b24ed320000 Mon Sep 17 00:00:00 2001
From: Chris Green <chrisgreen@arizona.edu>
Date: Wed, 20 Nov 2024 10:37:39 -0700
Subject: [PATCH 22/41] Closes #2547 Add ability to customize publication
 types. (#2574)

Co-authored-by: tadean <51835841+tadean@users.noreply.github.com>
Co-authored-by: Joe Parsons <471936+joeparsons@users.noreply.github.com>
Co-authored-by: Brian Berndt <74572157+bberndt-uaz@users.noreply.github.com>
---
 composer.json                                 |   3 +-
 config/install/user.role.az_content_admin.yml |  10 +
 .../data/az_demo_node_publication.json        |  20 +-
 .../migrations/az_demo_node_publication.yml   |   2 +-
 .../az_publication/az_publication.install     | 171 ++++++++++++++
 .../az_publication.links.action.yml           |   7 +-
 .../az_publication.links.task.yml             |  26 ++-
 .../az_publication/az_publication.module      |  89 +++++--
 .../az_publication.permissions.yml            |  36 +++
 .../az_publication_bibtex_import.yml          | 142 +++++------
 .../az_publication_type.theme.inc             |  40 ++++
 .../az_publication.type.az_article.yml        |   9 +
 ...az_publication.type.az_article_journal.yml |   9 +
 ...z_publication.type.az_article_magazine.yml |   9 +
 ..._publication.type.az_article_newspaper.yml |   9 +
 .../install/az_publication.type.az_bill.yml   |   9 +
 .../install/az_publication.type.az_book.yml   |   9 +
 .../az_publication.type.az_broadcast.yml      |   9 +
 .../az_publication.type.az_chapter.yml        |   9 +
 .../az_publication.type.az_classic.yml        |   9 +
 .../az_publication.type.az_collection.yml     |   9 +
 .../az_publication.type.az_dataset.yml        |   9 +
 .../az_publication.type.az_document.yml       |   9 +
 .../install/az_publication.type.az_entry.yml  |   9 +
 ...z_publication.type.az_entry_dictionary.yml |   9 +
 ...publication.type.az_entry_encyclopedia.yml |   9 +
 .../install/az_publication.type.az_event.yml  |   9 +
 .../install/az_publication.type.az_figure.yml |   9 +
 .../az_publication.type.az_graphic.yml        |   9 +
 .../az_publication.type.az_hearing.yml        |   9 +
 .../az_publication.type.az_interview.yml      |   9 +
 .../az_publication.type.az_legal_case.yml     |   9 +
 .../az_publication.type.az_legislation.yml    |   9 +
 .../az_publication.type.az_manuscript.yml     |   9 +
 .../install/az_publication.type.az_map.yml    |   9 +
 .../az_publication.type.az_motion_picture.yml |   9 +
 .../az_publication.type.az_musical_score.yml  |   9 +
 .../az_publication.type.az_pamphlet.yml       |   9 +
 ...z_publication.type.az_paper_conference.yml |   9 +
 .../install/az_publication.type.az_patent.yml |   9 +
 .../az_publication.type.az_performance.yml    |   9 +
 .../az_publication.type.az_periodical.yml     |   9 +
 ...ication.type.az_personal_communication.yml |   9 +
 .../install/az_publication.type.az_post.yml   |   9 +
 .../az_publication.type.az_post_weblog.yml    |   9 +
 .../az_publication.type.az_regulation.yml     |   9 +
 .../install/az_publication.type.az_report.yml |   9 +
 .../install/az_publication.type.az_review.yml |   9 +
 .../az_publication.type.az_review_book.yml    |   9 +
 .../az_publication.type.az_software.yml       |   9 +
 .../install/az_publication.type.az_song.yml   |   9 +
 .../install/az_publication.type.az_speech.yml |   9 +
 .../az_publication.type.az_standard.yml       |   9 +
 .../install/az_publication.type.az_thesis.yml |   9 +
 .../install/az_publication.type.az_treaty.yml |   9 +
 .../az_publication.type.az_webpage.yml        |   9 +
 ...rm_display.node.az_publication.default.yml |  16 +-
 ...ation.field_az_publication_mapped_type.yml |  23 ++
 ..._publication.field_az_publication_type.yml |   5 +-
 ....node.field_az_publication_mapped_type.yml |  22 ++
 .../install/views.view.az_publications.yml    |  32 +--
 .../schema/az_citation_style.schema.yml       |   1 +
 .../config/schema/az_publication.schema.yml   |   2 +-
 .../schema/az_publication_type.schema.yml     |  16 ++
 .../AZPublicationTypeHtmlRouteProvider.php    |  48 ++++
 .../src/AZPublicationTypeListBuilder.php      | 220 ++++++++++++++++++
 ...ickstartCitationStyleHtmlRouteProvider.php |   2 +
 .../AZQuickstartCitationStyleListBuilder.php  |  33 ++-
 .../AZPublicationTypeController.php           |  56 +++++
 .../src/Entity/AZPublicationType.php          | 147 ++++++++++++
 .../src/Entity/AZPublicationTypeInterface.php |  27 +++
 .../src/Entity/AZQuickstartCitationStyle.php  |  24 +-
 .../src/Form/AZPublicationTypeDeleteForm.php  |  69 ++++++
 .../src/Form/AZPublicationTypeForm.php        | 122 ++++++++++
 .../AZPublicationTypeSelection.php            |  34 +++
 ...z-publication-type-listing-table.html.twig |  45 ++++
 phpstan.neon                                  |   2 +
 77 files changed, 1739 insertions(+), 158 deletions(-)
 create mode 100644 modules/custom/az_publication/az_publication_type.theme.inc
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_article.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_article_journal.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_article_magazine.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_article_newspaper.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_bill.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_book.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_broadcast.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_chapter.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_classic.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_collection.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_dataset.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_document.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_entry.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_entry_dictionary.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_entry_encyclopedia.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_event.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_figure.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_graphic.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_hearing.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_interview.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_legal_case.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_legislation.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_manuscript.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_map.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_motion_picture.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_musical_score.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_pamphlet.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_paper_conference.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_patent.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_performance.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_periodical.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_personal_communication.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_post.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_post_weblog.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_regulation.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_report.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_review.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_review_book.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_software.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_song.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_speech.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_standard.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_thesis.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_treaty.yml
 create mode 100644 modules/custom/az_publication/config/install/az_publication.type.az_webpage.yml
 create mode 100644 modules/custom/az_publication/config/install/field.field.node.az_publication.field_az_publication_mapped_type.yml
 create mode 100644 modules/custom/az_publication/config/install/field.storage.node.field_az_publication_mapped_type.yml
 create mode 100644 modules/custom/az_publication/config/schema/az_publication_type.schema.yml
 create mode 100644 modules/custom/az_publication/src/AZPublicationTypeHtmlRouteProvider.php
 create mode 100644 modules/custom/az_publication/src/AZPublicationTypeListBuilder.php
 create mode 100644 modules/custom/az_publication/src/Controller/AZPublicationTypeController.php
 create mode 100644 modules/custom/az_publication/src/Entity/AZPublicationType.php
 create mode 100644 modules/custom/az_publication/src/Entity/AZPublicationTypeInterface.php
 create mode 100644 modules/custom/az_publication/src/Form/AZPublicationTypeDeleteForm.php
 create mode 100644 modules/custom/az_publication/src/Form/AZPublicationTypeForm.php
 create mode 100644 modules/custom/az_publication/src/Plugin/EntityReferenceSelection/AZPublicationTypeSelection.php
 create mode 100644 modules/custom/az_publication/templates/az-publication-type-listing-table.html.twig

diff --git a/composer.json b/composer.json
index 47c9daa259..0bcb03df90 100644
--- a/composer.json
+++ b/composer.json
@@ -174,7 +174,8 @@
                 "filter_autop returns self closing br element with slash, lets alter to br (2350049)": "https://www.drupal.org/files/issues/2024-08-15/2350049-48-reroll-against-11.x.patch",
                 "[10.2 regression] CKEditor 5 breaks when 'Source'/Source editing button is added and 'Manually editable HTML tags' are specified (3410100)": "https://www.drupal.org/files/issues/2024-01-23/drupal-revert-source-editing-validation-tightening-3410100-38.patch",
                 "[Apache only] Wrong file header returned, when converting an image for example to webp (3310963)": "https://www.drupal.org/files/issues/2024-05-15/3310963-32.patch",
-                "Hardcode a higher WebP conversion quality setting (3320689)": "https://gist.githubusercontent.com/joeparsons/d99b6c6eef240e8eaf768ba79e1c9f1b/raw/9b99325bd20907db0506969fc4f5823b46065c6b/3320689-10-3-x-hardcoded.patch"
+                "Hardcode a higher WebP conversion quality setting (3320689)": "https://gist.githubusercontent.com/joeparsons/d99b6c6eef240e8eaf768ba79e1c9f1b/raw/9b99325bd20907db0506969fc4f5823b46065c6b/3320689-10-3-x-hardcoded.patch",
+                "Add Views EntityReference filter to support better UX for exposed filters (3347343)": "https://gist.githubusercontent.com/trackleft/812286289ec98b72897ba9f59962d62a/raw/185b3481844d28c2d64a5f344e865da9382d0a08/add-Views-EntityReference-filter.patch"
             },
             "drupal/draggableviews": {
                 "Row weights not displaying on sort view (3252365)": "https://www.drupal.org/files/issues/2023-08-25/3252365-check-remove-select-all-class.patch",
diff --git a/config/install/user.role.az_content_admin.yml b/config/install/user.role.az_content_admin.yml
index 40ff60547d..17ab51e7d8 100644
--- a/config/install/user.role.az_content_admin.yml
+++ b/config/install/user.role.az_content_admin.yml
@@ -10,6 +10,7 @@ permissions:
   - 'access site reports'
   - 'access taxonomy overview'
   - 'access tokens overview'
+  - 'add publication type entities'
   - 'administer author entities'
   - 'administer block classes'
   - 'administer block content'
@@ -22,6 +23,7 @@ permissions:
   - 'administer languages'
   - 'administer menu'
   - 'administer meta tags'
+  - 'administer publication type entities'
   - 'administer quickstart configuration'
   - 'administer redirects'
   - 'administer shortcuts'
@@ -63,6 +65,7 @@ permissions:
   - 'delete any webform content'
   - 'delete any webform submission'
   - 'delete author entities'
+  - 'delete publication type entities'
   - 'delete content translations'
   - 'delete own az_carousel_item content'
   - 'delete terms in az_academic_programs'
@@ -79,8 +82,10 @@ permissions:
   - 'delete token'
   - 'delete webform submissions any node'
   - 'delete webform submissions own node'
+  - 'disable publication type entities'
   - 'edit any webform'
   - 'edit any webform submission'
+  - 'edit publication type entities'
   - 'edit terms in az_event_categories'
   - 'edit terms in az_news_tags'
   - 'edit terms in az_page_categories'
@@ -91,9 +96,14 @@ permissions:
   - 'edit webform assets'
   - 'edit webform submissions any node'
   - 'edit webform submissions own node'
+  - 'enable publication type entities'
   - 'renew token'
+  - 'revert all publication type revisions'
   - 'update any media'
   - 'update content translations'
   - 'use advanced search'
   - 'use marketing campaign page styles'
+  - 'view all publication type revisions'
+  - 'view disabled publication type entities'
+  - 'view enabled publication type entities'
   - 'view post access counter'
diff --git a/modules/custom/az_demo/data/az_demo_node_publication.json b/modules/custom/az_demo/data/az_demo_node_publication.json
index 2ece4e1792..c14459b66b 100644
--- a/modules/custom/az_demo/data/az_demo_node_publication.json
+++ b/modules/custom/az_demo/data/az_demo_node_publication.json
@@ -24,7 +24,7 @@
       "pmcid": "",
       "pmid": "",
       "publisher": "Historical Books Publishing",
-      "type": "book",
+      "type": "az_book",
       "version": "1st Edition",
       "volume": ""
     },
@@ -52,7 +52,7 @@
       "pmcid": "",
       "pmid": "",
       "publisher": "Mathematical Works Publishing",
-      "type": "article",
+      "type": "az_article",
       "version": "2nd Edition",
       "volume": ""
     },
@@ -80,7 +80,7 @@
       "pmcid": "PMC1234567",
       "pmid": "987654321",
       "publisher": "Science Journal Publishing",
-      "type": "article-journal",
+      "type": "az_article_journal",
       "version": "Final",
       "volume": "12"
     },
@@ -108,7 +108,7 @@
       "pmcid": "",
       "pmid": "",
       "publisher": "Tech books Publishing",
-      "type": "book",
+      "type": "az_book",
       "version": "3rd Edition",
       "volume": ""
     },
@@ -136,7 +136,7 @@
       "pmcid": "",
       "pmid": "",
       "publisher": "AI Conference Publishing",
-      "type": "Conference Paper",
+      "type": "az_paper_conference",
       "version": "1st Edition",
       "volume": ""
     },
@@ -164,7 +164,7 @@
       "pmcid": "",
       "pmid": "",
       "publisher": "Tech books Publishing",
-      "type": "book",
+      "type": "az_book",
       "version": "4th Edition",
       "volume": ""
     },
@@ -192,7 +192,7 @@
       "pmcid": "",
       "pmid": "",
       "publisher": "AI Books Publishing",
-      "type": "book",
+      "type": "az_book",
       "version": "1st Edition",
       "volume": ""
     },
@@ -220,7 +220,7 @@
       "pmcid": "PMC7654321",
       "pmid": "123456789",
       "publisher": "Statistical Journal Publishing",
-      "type": "article-journal",
+      "type": "az_article_journal",
       "version": "Final",
       "volume": "15"
     },
@@ -248,7 +248,7 @@
       "pmcid": "",
       "pmid": "",
       "publisher": "Ethics Books Publishing",
-      "type": "book",
+      "type": "az_book",
       "version": "2nd Edition",
       "volume": ""
     },
@@ -276,7 +276,7 @@
       "pmcid": "PMC2345678",
       "pmid": "234567890",
       "publisher": "Environmental Journal Publishing",
-      "type": "article-journal",
+      "type": "az_article_journal",
       "version": "Final",
       "volume": "20"
     }
diff --git a/modules/custom/az_demo/migrations/az_demo_node_publication.yml b/modules/custom/az_demo/migrations/az_demo_node_publication.yml
index 1711dbaa56..ad5cf8de82 100644
--- a/modules/custom/az_demo/migrations/az_demo_node_publication.yml
+++ b/modules/custom/az_demo/migrations/az_demo_node_publication.yml
@@ -116,7 +116,7 @@ process:
   field_az_publication_pmcid: pmcid
   field_az_publication_pmid: pmid
   field_az_publication_publisher: publisher
-  field_az_publication_type: type
+  field_az_publication_mapped_type/0/target_id: type
   field_az_publication_version: version
   field_az_publication_volume: volume
 destination:
diff --git a/modules/custom/az_publication/az_publication.install b/modules/custom/az_publication/az_publication.install
index ffeb793e5a..60fae898bf 100644
--- a/modules/custom/az_publication/az_publication.install
+++ b/modules/custom/az_publication/az_publication.install
@@ -5,8 +5,10 @@
  * Install, update and uninstall functions for az_publication module.
  */
 
+use Drupal\Core\Config\FileStorage;
 use Drupal\Core\Database\Database;
 use Drupal\Core\Utility\UpdateException;
+use Drupal\node\Entity\Node;
 
 /**
  * Install the new az_curated_views module (now required by az_publication).
@@ -83,3 +85,172 @@ function az_publication_update_1020702() {
   }
 
 }
+
+/**
+ * Adds field_az_publication_mapped_type field.
+ */
+function az_publication_update_1021001() {
+  $module_dir = \Drupal::service('extension.list.module')->getPath('az_publication');
+  $module_path = $module_dir . '/config/install';
+  // Create a new FileStorage object.
+  $source_storage = new FileStorage($module_path);
+  $config_factory = \Drupal::service('config.factory');
+  // Install the az_publication_type entity type.
+  $entity_type_manager = \Drupal::service('entity_type.manager');
+  $entity_type_definition = $entity_type_manager->getDefinition('az_publication_type');
+  \Drupal::entityDefinitionUpdateManager()->installEntityType($entity_type_definition);
+  $entity_type_manager->clearCachedDefinitions();
+  // If the field storage and field config are new, import them.
+  if ($config_factory->get('field.storage.node.field_az_publication_mapped_type')->isNew()) {
+    $field_storage_config = $source_storage->read('field.storage.node.field_az_publication_mapped_type');
+    \Drupal::entityTypeManager()->getStorage('field_storage_config')->create($field_storage_config)->save();
+  }
+  if ($config_factory->get('field.field.node.az_publication.field_az_publication_mapped_type')->isNew()) {
+    $field_config = $source_storage->read('field.field.node.az_publication.field_az_publication_mapped_type');
+    \Drupal::entityTypeManager()->getStorage('field_config')->create($field_config)->save();
+  }
+  // Clear caches after importing the configurations.
+  \Drupal::service('entity_field.manager')->clearCachedFieldDefinitions();
+
+}
+
+/**
+ * Map and move data from static text field to dynamic type reference field.
+ */
+function az_publication_update_1021002(&$sandbox) {
+  // Initialize or retrieve the batch progress information.
+  if (!isset($sandbox['progress'])) {
+    $sandbox['progress'] = 0;
+    $sandbox['current_node'] = 0;
+
+    // Query all node IDs of type 'az_publication'.
+    $sandbox['nids'] = \Drupal::entityQuery('node')
+      ->condition('type', 'az_publication')
+      ->accessCheck(FALSE)
+      ->execute();
+
+    $sandbox['max'] = count($sandbox['nids']);
+  }
+
+  // Define the mapping from old field values to new config entity IDs.
+  $mapping = [
+    'article' => 'az_article',
+    'article-journal' => 'az_article_journal',
+    'article-magazine' => 'az_article_magazine',
+    'article-newspaper' => 'az_article_newspaper',
+    'bill' => 'az_bill',
+    'book' => 'az_book',
+    'broadcast' => 'az_broadcast',
+    'chapter' => 'az_chapter',
+    'classic' => 'az_classic',
+    'collection' => 'az_collection',
+    'dataset' => 'az_dataset',
+    'document' => 'az_document',
+    'entry' => 'az_entry',
+    'entry-dictionary' => 'az_entry_dictionary',
+    'entry-encyclopedia' => 'az_entry_encyclopedia',
+    'event' => 'az_event',
+    'figure' => 'az_figure',
+    'graphic' => 'az_graphic',
+    'hearing' => 'az_hearing',
+    'interview' => 'az_interview',
+    'legal_case' => 'az_legal_case',
+    'legislation' => 'az_legislation',
+    'manuscript' => 'az_manuscript',
+    'map' => 'az_map',
+    'motion_picture' => 'az_motion_picture',
+    'musical_score' => 'az_musical_score',
+    'pamphlet' => 'az_pamphlet',
+    'paper-conference' => 'az_paper_conference',
+    'patent' => 'az_patent',
+    'performance' => 'az_performance',
+    'periodical' => 'az_periodical',
+    'personal_communication' => 'az_personal_communication',
+    'post' => 'az_post',
+    'post-weblog' => 'az_post_weblog',
+    'regulation' => 'az_regulation',
+    'report' => 'az_report',
+    'review' => 'az_review',
+    'review-book' => 'az_review_book',
+    'software' => 'az_software',
+    'song' => 'az_song',
+    'speech' => 'az_speech',
+    'standard' => 'az_standard',
+    'thesis' => 'az_thesis',
+    'treaty' => 'az_treaty',
+    'webpage' => 'az_webpage',
+  ];
+
+  // Process nodes in batches.
+  // Number of nodes to process per batch.
+  $limit = 50;
+  $nids_slice = array_slice($sandbox['nids'], $sandbox['progress'], $limit);
+  $nodes = Node::loadMultiple($nids_slice);
+  $time = \Drupal::service('datetime.time');
+
+  foreach ($nodes as $node) {
+    if ($node->hasField('field_az_publication_type') && !$node->get('field_az_publication_type')->isEmpty()) {
+      $old_value = $node->get('field_az_publication_type')->value;
+      $new_value = $mapping[$old_value];
+
+      // Map and update the new entity reference field.
+      if (isset($mapping[$old_value])) {
+        $node->set('field_az_publication_mapped_type', ['target_id' => $mapping[$old_value]]);
+        $node->setNewRevision(TRUE);
+        $node->isDefaultRevision(TRUE);
+        // Construct a detailed message.
+        $revision_log_message = sprintf(
+          "Publication type updated from '%s' to '%s' as part of data migration to a customizable type reference field. For more information about how to use this feature, see https://quickstart.arizona.edu/node/220",
+          $old_value,
+          $new_value
+        );
+        $node->setRevisionLogMessage($revision_log_message);
+        $node->setRevisionCreationTime($time->getRequestTime());
+        $node->setRevisionUserId(1);
+        $node->save();
+      }
+    }
+
+    $sandbox['progress']++;
+    $sandbox['current_node'] = $node->id();
+  }
+
+  // Inform the batch API about the progress.
+  $sandbox['#finished'] = $sandbox['progress'] / $sandbox['max'];
+}
+
+/**
+ * Helper function to return batch info.
+ */
+function az_publication_batch_info() {
+  return [
+    'title' => t('Updating AZ Publication Nodes...'),
+    'operations' => [
+      ['az_publication_update_1020902', []],
+    ],
+    'finished' => 'az_publication_batch_finished',
+  ];
+}
+
+/**
+ * Finished callback for the batch.
+ */
+function az_publication_batch_finished($success, $results, $operations) {
+  $messenger = \Drupal::messenger();
+
+  if ($success) {
+    $message = \Drupal::translation()->formatPlural(count($results),
+      'One publication successfully processed.', '@count publications successfully processed.');
+  }
+  else {
+    // Handle the case where the batch did not complete successfully.
+    // $operations contains the operations that remained unprocessed.
+    $error_operation = reset($operations);
+    $message = t('An error occurred while processing %error_operation with arguments: @arguments', [
+      '%error_operation' => $error_operation[0],
+      '@arguments' => print_r($error_operation[1], TRUE),
+    ]);
+  }
+
+  $messenger->addMessage($message);
+}
diff --git a/modules/custom/az_publication/az_publication.links.action.yml b/modules/custom/az_publication/az_publication.links.action.yml
index e530d883cf..79f2df3927 100644
--- a/modules/custom/az_publication/az_publication.links.action.yml
+++ b/modules/custom/az_publication/az_publication.links.action.yml
@@ -3,8 +3,13 @@ entity.az_author.add_form:
   title: 'Add Author'
   appears_on:
     - entity.az_author.collection
+entity.az_publication_type.add_form:
+  route_name: entity.az_publication_type.add_form
+  title: 'Add Publication Type'
+  appears_on:
+    - entity.az_publication_type.collection
 entity.az_citation_style.add_form:
   route_name: entity.az_citation_style.add_form
-  title: 'Add Quickstart Citation Style'
+  title: 'Add Citation Style'
   appears_on:
     - entity.az_citation_style.collection
diff --git a/modules/custom/az_publication/az_publication.links.task.yml b/modules/custom/az_publication/az_publication.links.task.yml
index 3c43cab548..20b9a03767 100644
--- a/modules/custom/az_publication/az_publication.links.task.yml
+++ b/modules/custom/az_publication/az_publication.links.task.yml
@@ -39,11 +39,33 @@ az_publication.az_publication_settings_tab:
 
 az_publication.az_publication_settings_secondary_tab:
   route_name: az_publication.settings
-  title: 'Publication Settings'
+  title: 'General'
   parent_id: az_publication.az_publication_settings_tab
 
+az_publication.az_publication_type_secondary_tab:
+  route_name: entity.az_publication_type.collection
+  title: 'Types'
+  parent_id: az_publication.az_publication_settings_tab
+  weight: 2
+
+entity.az_publication_type.canonical:
+  route_name: entity.az_publication_type.canonical
+  base_route: entity.az_publication_type.canonical
+  title: 'View'
+
+entity.az_publication_type.edit_form:
+  route_name: entity.az_publication_type.edit_form
+  base_route: entity.az_publication_type.canonical
+  title: 'Edit'
+
+entity.az_publication_type.delete_form:
+  route_name:  entity.az_publication_type.delete_form
+  base_route:  entity.az_publication_type.canonical
+  title: Delete
+  weight: 10
+
 az_publication.az_citation_styles_secondary_tab:
   route_name: entity.az_citation_style.collection
   title: 'Citation Styles'
   parent_id: az_publication.az_publication_settings_tab
-  weight: 2
+  weight: 3
diff --git a/modules/custom/az_publication/az_publication.module b/modules/custom/az_publication/az_publication.module
index 4c5f89877d..d3ec8b7158 100644
--- a/modules/custom/az_publication/az_publication.module
+++ b/modules/custom/az_publication/az_publication.module
@@ -9,7 +9,6 @@ use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\Core\Datetime\Element\Datetime;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Url;
@@ -21,6 +20,34 @@ use Drupal\views\Plugin\Block\ViewsBlock;
 use Seboettg\CiteProc\CiteProc;
 use Symfony\Component\HttpFoundation\Request;
 
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function az_publication_form_view_add_form_alter(&$form, FormStateInterface $form_state) {
+  $options = [];
+  foreach ($form['displays']['show']['wizard_key']['#options'] as $key => $option) {
+    $group = (strpos($key, 'standard:') === 0 || strpos($key, 'az_publication') === 0) ? 'Configuration' : 'Content';
+    $options[$group][$key] = $option;
+  }
+
+  // Refactored sorting logic.
+  az_publication_sort_options_by_render($options, 'Content');
+  az_publication_sort_options_by_render($options, 'Configuration');
+
+  $form['displays']['show']['wizard_key']['#options'] = $options;
+}
+
+/**
+ * Sorts options by render method.
+ */
+function az_publication_sort_options_by_render(array &$options, $key) {
+  if (isset($options[$key]) && is_array($options[$key])) {
+    uasort($options[$key], function ($a, $b) {
+      return $a->render() <=> $b->render();
+    });
+  }
+}
+
 /**
  * Implements hook_entity_extra_field_info().
  */
@@ -95,6 +122,14 @@ function az_publication_theme() {
       'template' => 'views-exposed-form--az-publications',
       'base hook' => 'views_exposed_form',
     ],
+    'az_publication_type_listing_table' => [
+      'variables' => [
+        'headers' => NULL,
+        'rows' => NULL,
+        '#attributes' => [],
+      ],
+      'file' => 'az_publication_type.theme.inc',
+    ],
   ];
 }
 
@@ -102,13 +137,9 @@ function az_publication_theme() {
  * Implements hook_ENTITY_TYPE_view().
  */
 function az_publication_node_view(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display, $view_mode) {
+  if ($entity instanceof NodeInterface) {
+    if ($display->getComponent('az_publication_bibliography') && $entity->hasField('field_az_publication_mapped_type')) {
 
-  // Only if fields suggest a publication.
-  if ($entity instanceof NodeInterface &&
-      $entity instanceof FieldableEntityInterface &&
-      $entity->hasField('field_az_publication_type') &&
-      !empty($entity->field_az_publication_type->value)) {
-    if ($display->getComponent('az_publication_bibliography')) {
       // Publication fields to CSL schema mappings.
       $pmap = [
         'field_az_publication_container' => 'container-title',
@@ -133,16 +164,25 @@ function az_publication_node_view(array &$build, EntityInterface $entity, Entity
         'field_az_author_suffix' => 'suffix',
         'field_az_author_literal' => 'literal',
       ];
+      $default_config = \Drupal::config('az_publication.settings');
       $blob = new stdClass();
       $blob->title = $entity->getTitle();
       $blob->id = $entity->id();
-      $blob->type = $entity->field_az_publication_type->value;
+      $blob->type = 'article-journal';
+      $az_publication_mapped_type_field = $entity->get('field_az_publication_mapped_type');
+      if (!$az_publication_mapped_type_field->isEmpty()) {
+        $az_publication_mapped_type_id = $az_publication_mapped_type_field->target_id;
+        $entity_type_manager = \Drupal::entityTypeManager();
+        $az_publication_type_storage = $entity_type_manager->getStorage('az_publication_type');
+        $az_publication_mapped_type = $az_publication_type_storage->load($az_publication_mapped_type_id);
+        if (isset($az_publication_mapped_type) && $az_publication_mapped_type->get('type')) {
+          $blob->type = $az_publication_mapped_type->get('type');
+        }
+      }
       // Load default citation settings.
       $locale = \Drupal::service('az_publication.locale_metadata')->getLocaleId();
       $repository = \Drupal::service('entity.repository');
-      $default_config = \Drupal::config('az_publication.settings');
       $style_context = $default_config->get('default_citation_style');
-
       // Attempt to find citation argument context.
       if (function_exists('views_get_current_view')) {
         $view = views_get_current_view();
@@ -228,7 +268,8 @@ function az_publication_node_view(array &$build, EntityInterface $entity, Entity
           $date->{'date-parts'}[] = explode('-', $entity->field_az_accessed_date->value);
           $blob->accessed = $date;
         }
-        // By default, provide a link to the node page if nothing else applies.
+        // By default, provide a link to the node page
+        // if nothing else applies.
         try {
           // Canonical full node should not link to itself.
           if ($view_mode !== 'full') {
@@ -258,7 +299,6 @@ function az_publication_node_view(array &$build, EntityInterface $entity, Entity
             $blob->itemlink = urldecode($file_entity->createFileUrl(TRUE));
           }
         }
-
         $additionalLinks = [];
         if (!empty($entity->field_az_publication_extra_links)) {
           foreach ($entity->field_az_publication_extra_links as $item) {
@@ -403,7 +443,7 @@ function az_publication_preprocess_views_view(&$variables) {
     if ($variables['id'] === 'az_publications') {
       // Reduce the width of the text input form elements from the default.
       $resize_element = [
-        'name',
+        'author-name',
         'title',
       ];
       foreach ($resize_element as $element) {
@@ -412,15 +452,13 @@ function az_publication_preprocess_views_view(&$variables) {
         }
       }
       // Year field doesn't need a standard width text field.
-      if (!empty($variables['exposed']['field_az_publication_date_value'])) {
-        $variables['exposed']['field_az_publication_date_value']['#size'] = 6;
+      if (!empty($variables['exposed']['date'])) {
+        $variables['exposed']['date']['#size'] = 6;
       }
-      if (!empty($variables['exposed']['field_az_publication_type_value'])) {
-        // Add class so publication type select is styled like text inputs.
-        $variables['exposed']['field_az_publication_type_value']['#attributes']['class'][] = 'form-text';
+      if (!empty($variables['exposed']['type'])) {
         // Make sure type filter is styled as a form control.
-        $variables['exposed']['field_az_publication_type_value']['#attributes']['class'][] = 'form-select';
-        $variables['exposed']['field_az_publication_type_value']['#attributes']['class'][] = 'form-control';
+        $variables['exposed']['type']['#attributes']['class'][] = 'form-select';
+        $variables['exposed']['type']['#attributes']['class'][] = 'form-control';
       }
     }
   }
@@ -652,3 +690,14 @@ function az_publication_form_node_az_publication_edit_form_alter(&$form, FormSta
 
   _az_publication_form_revisions($form, $form_state, $form_id);
 }
+
+/**
+ * Implements hook_views_data_alter().
+ *
+ * See https://www.drupal.org/project/drupal/issues/3347343
+ */
+function az_publication_views_data_alter(&$data) {
+  // Use entity reference for the field 'field_az_publication_mapped_type'.
+  $field_name = 'field_az_publication_mapped_type';
+  $data['node__' . $field_name][$field_name . '_target_id']['filter']['id'] = 'entity_reference';
+}
diff --git a/modules/custom/az_publication/az_publication.permissions.yml b/modules/custom/az_publication/az_publication.permissions.yml
index cd25d8a396..ae34bea8cb 100644
--- a/modules/custom/az_publication/az_publication.permissions.yml
+++ b/modules/custom/az_publication/az_publication.permissions.yml
@@ -29,3 +29,39 @@ delete all author revisions:
   title: 'Delete all revisions'
   description: 'Role requires permission to <em>view Author revisions</em> and <em>delete rights</em> for author entities in question or <em>administer author entities</em>.'
 
+add publication type entities:
+  title: 'Create new Publication Type entities'
+
+administer publication type entities:
+  title: 'Administer Publication Type entities'
+  description: 'Allow to access the administration form to configure Publication Type entities.'
+  restrict access: true
+
+delete publication type entities:
+  title: 'Delete Publication Type entities'
+
+edit publication type entities:
+  title: 'Edit Publication Type entities'
+
+view enabled publication type entities:
+  title: 'View enabled Publication Type entities'
+
+view disabled publication type entities:
+  title: 'View disabled Publication Type entities'
+
+view all publication type revisions:
+  title: 'View all Publication Type revisions'
+
+revert all publication type revisions:
+  title: 'Revert all Publication Type revisions'
+  description: 'Role requires permission <em>view Publication Type revisions</em> and <em>edit rights</em> for publication type entities in question or <em>administer publication type entities</em>.'
+
+delete all publication type revisions:
+  title: 'Delete all Publication Type revisions'
+  description: 'Role requires permission to <em>view Publication Type revisions</em> and <em>delete rights</em> for publication type entities in question or <em>administer publication type entities</em>.'
+
+disable publication type entities:
+  title: 'Disable Publication Type entities'
+
+enable publication type entities:
+  title: 'Enable Publication Type entities'
diff --git a/modules/custom/az_publication/az_publication_bibtex/migrations/az_publication_bibtex_import.yml b/modules/custom/az_publication/az_publication_bibtex/migrations/az_publication_bibtex_import.yml
index fe6f5c0b14..3bb6add727 100644
--- a/modules/custom/az_publication/az_publication_bibtex/migrations/az_publication_bibtex_import.yml
+++ b/modules/custom/az_publication/az_publication_bibtex/migrations/az_publication_bibtex_import.yml
@@ -11,118 +11,92 @@ source:
     citation_key:
       type: string
   fields:
-    -
-      name: _type
+    - name: _type
       selector: _type
-    -
-      name: citation_key
+    - name: citation_key
       selector: citation-key
-    -
-      name: title
+    - name: title
       selector: title
-    -
-      name: author
+    - name: author
       selector: author
-    -
-      name: publisher
+    - name: publisher
       selector: publisher
-    -
-      name: institution
+    - name: institution
       selector: institution
-    -
-      name: school
+    - name: school
       selector: school
-    -
-      name: location
+    - name: location
       selector: location
-    -
-      name: volume
+    - name: volume
       selector: volume
-    -
-      name: pages
+    - name: pages
       selector: pages
-    -
-      name: number
+    - name: number
       selector: number
-    -
-      name: booktitle
+    - name: booktitle
       selector: booktitle
-    -
-      name: journaltitle
+    - name: journaltitle
       selector: journaltitle
-    -
-      name: journal
+    - name: journal
       selector: journal
-    -
-      name: annotation
+    - name: annotation
       selector: annotation
-    -
-      name: abstract
+    - name: abstract
       selector: abstract
-    -
-      name: url
+    - name: url
       selector: url
-    -
-      name: doi
+    - name: doi
       selector: doi
-    -
-      name: issn
+    - name: issn
       selector: issn
-    -
-      name: isbn
+    - name: isbn
       selector: isbn
-    -
-      name: pmid
+    - name: pmid
       selector: pmid
-    -
-      name: pmcid
+    - name: pmcid
       selector: pmcid
-    -
-      name: version
+    - name: version
       selector: version
-    -
-      name: datetype
+    - name: datetype
       selector: _date_type
-    -
-      name: date
+    - name: date
       selector: _date
-
 process:
   type:
     plugin: default_value
     default_value: az_publication
-  field_az_publication_type:
-    plugin: static_map
-    source: _type
-    map:
-      article: article-journal
-      book: book
-      booklet: pamphlet
-      collection: collection
-      conference: paper-conference
-      inbook: book
-      incollection: entry
-      inproceedings: paper-conference
-      manual: pamphlet
-      mastersthesis: thesis
-      misc: post
-      online: webpage
-      patent: patent
-      periodical: periodical
-      phdthesis: thesis
-      proceedings: paper-conference
-      report: report
-      techreport: report
-      thesis: thesis
-      unpublished: manuscript
-    default_value: article-journal
+  field_az_publication_mapped_type/0/target_id:
+    - plugin: static_map
+      source: _type
+      map:
+        article: az_article_journal
+        book: az_book
+        booklet: az_pamphlet
+        collection: az_collection
+        conference: az_paper_conference
+        inbook: az_book
+        incollection: az_entry
+        inproceedings: az_paper_conference
+        manual: az_pamphlet
+        mastersthesis: az_thesis
+        misc: az_post
+        online: az_webpage
+        patent: az_patent
+        periodical: az_periodical
+        phdthesis: az_thesis
+        proceedings: az_paper_conference
+        report: az_report
+        techreport: az_report
+        thesis: az_thesis
+        unpublished: az_manuscript
+      default_value: az_article_journal
   title: title
   field_az_publication_date_type: datetype
   field_az_publication_date:
     plugin: format_date
-    from_format: 'Y-m-d'
-    to_format: 'Y-m-d'
-    from_timezone: 'UTC'
+    from_format: Y-m-d
+    to_format: Y-m-d
+    from_timezone: UTC
     source: date
   field_az_publication_container:
     plugin: null_coalesce
@@ -146,7 +120,7 @@ process:
       - institution
       - school
   field_az_publication_page: pages
-  'field_az_publication_link/uri': url
+  field_az_publication_link/uri: url
   field_az_publication_doi: doi
   field_az_publication_issn: issn
   field_az_publication_isbn: isbn
@@ -160,16 +134,14 @@ process:
     source: author
     process:
       fullname:
-        -
-          plugin: callback
+        - plugin: callback
           callable: array_filter
           source:
             - first
             - von
             - last
             - jr
-        -
-          plugin: concat
+        - plugin: concat
           delimiter: ' '
       target_id:
         plugin: entity_generate
@@ -184,11 +156,9 @@ process:
           field_az_author_nondrop_particle: von
           field_az_author_lname: last
           field_az_author_suffix: jr
-
 destination:
   plugin: entity:node
   bundle: az_publication
-
 dependencies:
   enforced:
     module:
diff --git a/modules/custom/az_publication/az_publication_type.theme.inc b/modules/custom/az_publication/az_publication_type.theme.inc
new file mode 100644
index 0000000000..27eae6f65c
--- /dev/null
+++ b/modules/custom/az_publication/az_publication_type.theme.inc
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @file
+ * Preprocessors and theme functions for the Views UI.
+ */
+
+use Drupal\Core\Template\Attribute;
+
+/**
+ * Prepares variables for AZ Publication type listing templates.
+ *
+ * Default template: az-publication-type-listing-table.html.twig.
+ *
+ * @param array $variables
+ *   An associative array containing:
+ *   - headers: An associative array containing the headers for the type
+ *     listing table.
+ *   - rows: An associative array containing the rows data for the type
+ *     listing table.
+ */
+function template_preprocess_az_publication_type_listing_table(&$variables) {
+  // Convert the attributes to valid attribute objects for headers.
+  foreach ($variables['headers'] as $key => $header) {
+    // Check if '#attributes' exists and is an array before trying to access it.
+    if (is_array($header) && isset($header['#attributes']) && is_array($header['#attributes'])) {
+      $variables['headers'][$key]['attributes'] = new Attribute($header['#attributes']);
+    }
+  }
+  // Convert the attributes to valid attribute objects for rows.
+  if (!empty($variables['rows'])) {
+    foreach ($variables['rows'] as $key => $row) {
+      // Check if '#attributes' exists and is an array before trying to
+      // access it.
+      if (is_array($row) && isset($row['#attributes']) && is_array($row['#attributes'])) {
+        $variables['rows'][$key]['attributes'] = new Attribute($row['#attributes']);
+      }
+    }
+  }
+}
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_article.yml b/modules/custom/az_publication/config/install/az_publication.type.az_article.yml
new file mode 100644
index 0000000000..21a958e214
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_article.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_article
+type: 'article'
+label: 'Article'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_article_journal.yml b/modules/custom/az_publication/config/install/az_publication.type.az_article_journal.yml
new file mode 100644
index 0000000000..10f4df3d25
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_article_journal.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_article_journal
+type: 'article-journal'
+label: 'Journal Article'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_article_magazine.yml b/modules/custom/az_publication/config/install/az_publication.type.az_article_magazine.yml
new file mode 100644
index 0000000000..039c343fdb
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_article_magazine.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_article_magazine
+type: 'article-magazine'
+label: 'Magazine Article'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_article_newspaper.yml b/modules/custom/az_publication/config/install/az_publication.type.az_article_newspaper.yml
new file mode 100644
index 0000000000..a55e88c4bd
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_article_newspaper.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_article_newspaper
+type: 'article-newspaper'
+label: 'Newspaper Article'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_bill.yml b/modules/custom/az_publication/config/install/az_publication.type.az_bill.yml
new file mode 100644
index 0000000000..4f813d2cdd
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_bill.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_bill
+type: 'bill'
+label: 'Bill'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_book.yml b/modules/custom/az_publication/config/install/az_publication.type.az_book.yml
new file mode 100644
index 0000000000..09b8727815
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_book.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_book
+type: 'book'
+label: 'Book'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_broadcast.yml b/modules/custom/az_publication/config/install/az_publication.type.az_broadcast.yml
new file mode 100644
index 0000000000..7565183ce4
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_broadcast.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_broadcast
+type: 'broadcast'
+label: 'Broadcast'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_chapter.yml b/modules/custom/az_publication/config/install/az_publication.type.az_chapter.yml
new file mode 100644
index 0000000000..f3b3458a8a
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_chapter.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_chapter
+type: 'chapter'
+label: 'Chapter'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_classic.yml b/modules/custom/az_publication/config/install/az_publication.type.az_classic.yml
new file mode 100644
index 0000000000..032aa4b8d2
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_classic.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_classic
+type: 'classic'
+label: 'Classic'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_collection.yml b/modules/custom/az_publication/config/install/az_publication.type.az_collection.yml
new file mode 100644
index 0000000000..9affc755a4
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_collection.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_collection
+type: 'collection'
+label: 'Collection'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_dataset.yml b/modules/custom/az_publication/config/install/az_publication.type.az_dataset.yml
new file mode 100644
index 0000000000..b2ce337ed9
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_dataset.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_dataset
+type: 'dataset'
+label: 'Dataset'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_document.yml b/modules/custom/az_publication/config/install/az_publication.type.az_document.yml
new file mode 100644
index 0000000000..2726eaca43
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_document.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_document
+type: 'document'
+label: 'Document'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_entry.yml b/modules/custom/az_publication/config/install/az_publication.type.az_entry.yml
new file mode 100644
index 0000000000..dc0157c30f
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_entry.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_entry
+type: 'entry'
+label: 'Entry'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_entry_dictionary.yml b/modules/custom/az_publication/config/install/az_publication.type.az_entry_dictionary.yml
new file mode 100644
index 0000000000..670101e51b
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_entry_dictionary.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_entry_dictionary
+type: 'entry-dictionary'
+label: 'Dictionary Entry'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_entry_encyclopedia.yml b/modules/custom/az_publication/config/install/az_publication.type.az_entry_encyclopedia.yml
new file mode 100644
index 0000000000..bbbcdeaffd
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_entry_encyclopedia.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_entry_encyclopedia
+type: 'entry-encyclopedia'
+label: 'Encyclopedia Entry'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_event.yml b/modules/custom/az_publication/config/install/az_publication.type.az_event.yml
new file mode 100644
index 0000000000..79c91ced65
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_event.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_event
+type: 'event'
+label: 'Event'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_figure.yml b/modules/custom/az_publication/config/install/az_publication.type.az_figure.yml
new file mode 100644
index 0000000000..633c00b7e0
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_figure.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_figure
+type: 'figure'
+label: 'Figure'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_graphic.yml b/modules/custom/az_publication/config/install/az_publication.type.az_graphic.yml
new file mode 100644
index 0000000000..f444c010e6
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_graphic.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_graphic
+type: 'graphic'
+label: 'Graphic'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_hearing.yml b/modules/custom/az_publication/config/install/az_publication.type.az_hearing.yml
new file mode 100644
index 0000000000..beb90fb783
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_hearing.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_hearing
+type: 'hearing'
+label: 'Hearing'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_interview.yml b/modules/custom/az_publication/config/install/az_publication.type.az_interview.yml
new file mode 100644
index 0000000000..4e28cdbcb8
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_interview.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_interview
+type: 'interview'
+label: 'Interview'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_legal_case.yml b/modules/custom/az_publication/config/install/az_publication.type.az_legal_case.yml
new file mode 100644
index 0000000000..906411b259
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_legal_case.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_legal_case
+type: 'legal_case'
+label: 'Legal Case'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_legislation.yml b/modules/custom/az_publication/config/install/az_publication.type.az_legislation.yml
new file mode 100644
index 0000000000..af82123722
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_legislation.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_legislation
+type: 'legislation'
+label: 'Legislation'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_manuscript.yml b/modules/custom/az_publication/config/install/az_publication.type.az_manuscript.yml
new file mode 100644
index 0000000000..14419d12f8
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_manuscript.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_manuscript
+type: 'manuscript'
+label: 'Manuscript'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_map.yml b/modules/custom/az_publication/config/install/az_publication.type.az_map.yml
new file mode 100644
index 0000000000..655cfb1c8f
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_map.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_map
+type: 'map'
+label: 'Map'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_motion_picture.yml b/modules/custom/az_publication/config/install/az_publication.type.az_motion_picture.yml
new file mode 100644
index 0000000000..281556f64d
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_motion_picture.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_motion_picture
+type: 'motion_picture'
+label: 'Motion Picture'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_musical_score.yml b/modules/custom/az_publication/config/install/az_publication.type.az_musical_score.yml
new file mode 100644
index 0000000000..f9c5f7b22f
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_musical_score.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_musical_score
+type: 'musical_score'
+label: 'Musical Score'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_pamphlet.yml b/modules/custom/az_publication/config/install/az_publication.type.az_pamphlet.yml
new file mode 100644
index 0000000000..39d99378ee
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_pamphlet.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_pamphlet
+type: 'pamphlet'
+label: 'Pamphlet'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_paper_conference.yml b/modules/custom/az_publication/config/install/az_publication.type.az_paper_conference.yml
new file mode 100644
index 0000000000..ab2674ca74
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_paper_conference.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_paper_conference
+type: 'paper-conference'
+label: 'Conference Paper'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_patent.yml b/modules/custom/az_publication/config/install/az_publication.type.az_patent.yml
new file mode 100644
index 0000000000..ed10763dcf
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_patent.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_patent
+type: 'patent'
+label: 'Patent'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_performance.yml b/modules/custom/az_publication/config/install/az_publication.type.az_performance.yml
new file mode 100644
index 0000000000..79db14ca61
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_performance.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_performance
+type: 'performance'
+label: 'Performance'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_periodical.yml b/modules/custom/az_publication/config/install/az_publication.type.az_periodical.yml
new file mode 100644
index 0000000000..1011bb8220
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_periodical.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_periodical
+type: 'periodical'
+label: 'Periodical'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_personal_communication.yml b/modules/custom/az_publication/config/install/az_publication.type.az_personal_communication.yml
new file mode 100644
index 0000000000..17444c5a63
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_personal_communication.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_personal_communication
+type: 'personal_communication'
+label: 'Personal Communication'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_post.yml b/modules/custom/az_publication/config/install/az_publication.type.az_post.yml
new file mode 100644
index 0000000000..c40d01bf81
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_post.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_post
+type: 'post'
+label: 'Post'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_post_weblog.yml b/modules/custom/az_publication/config/install/az_publication.type.az_post_weblog.yml
new file mode 100644
index 0000000000..1b72a332b2
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_post_weblog.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_post_weblog
+type: 'post-weblog'
+label: 'Weblog Post'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_regulation.yml b/modules/custom/az_publication/config/install/az_publication.type.az_regulation.yml
new file mode 100644
index 0000000000..723d1edc1c
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_regulation.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_regulation
+type: 'regulation'
+label: 'Regulation'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_report.yml b/modules/custom/az_publication/config/install/az_publication.type.az_report.yml
new file mode 100644
index 0000000000..d8078ab8ad
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_report.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_report
+type: 'report'
+label: 'Report'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_review.yml b/modules/custom/az_publication/config/install/az_publication.type.az_review.yml
new file mode 100644
index 0000000000..0ec907b131
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_review.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_review
+type: 'review'
+label: 'Review'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_review_book.yml b/modules/custom/az_publication/config/install/az_publication.type.az_review_book.yml
new file mode 100644
index 0000000000..206fe6e19c
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_review_book.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_review_book
+type: 'review-book'
+label: 'Book Review'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_software.yml b/modules/custom/az_publication/config/install/az_publication.type.az_software.yml
new file mode 100644
index 0000000000..73e6973a76
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_software.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_software
+type: 'software'
+label: 'Software'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_song.yml b/modules/custom/az_publication/config/install/az_publication.type.az_song.yml
new file mode 100644
index 0000000000..c070512411
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_song.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_song
+type: 'song'
+label: 'Song'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_speech.yml b/modules/custom/az_publication/config/install/az_publication.type.az_speech.yml
new file mode 100644
index 0000000000..d56ee6bdbd
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_speech.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_speech
+type: 'speech'
+label: 'Speech'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_standard.yml b/modules/custom/az_publication/config/install/az_publication.type.az_standard.yml
new file mode 100644
index 0000000000..3e99fea47d
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_standard.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_standard
+type: 'standard'
+label: 'Standard'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_thesis.yml b/modules/custom/az_publication/config/install/az_publication.type.az_thesis.yml
new file mode 100644
index 0000000000..6cfa474431
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_thesis.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_thesis
+type: 'thesis'
+label: 'Thesis'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_treaty.yml b/modules/custom/az_publication/config/install/az_publication.type.az_treaty.yml
new file mode 100644
index 0000000000..ddf1287d4c
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_treaty.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_treaty
+type: 'treaty'
+label: 'Treaty'
diff --git a/modules/custom/az_publication/config/install/az_publication.type.az_webpage.yml b/modules/custom/az_publication/config/install/az_publication.type.az_webpage.yml
new file mode 100644
index 0000000000..14a42d4c6f
--- /dev/null
+++ b/modules/custom/az_publication/config/install/az_publication.type.az_webpage.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - az_publication
+id: az_webpage
+type: 'webpage'
+label: 'Webpage'
diff --git a/modules/custom/az_publication/config/install/core.entity_form_display.node.az_publication.default.yml b/modules/custom/az_publication/config/install/core.entity_form_display.node.az_publication.default.yml
index 07f3535a60..118ca0834c 100644
--- a/modules/custom/az_publication/config/install/core.entity_form_display.node.az_publication.default.yml
+++ b/modules/custom/az_publication/config/install/core.entity_form_display.node.az_publication.default.yml
@@ -18,6 +18,7 @@ dependencies:
     - field.field.node.az_publication.field_az_publication_issue
     - field.field.node.az_publication.field_az_publication_link
     - field.field.node.az_publication.field_az_publication_location
+    - field.field.node.az_publication.field_az_publication_mapped_type
     - field.field.node.az_publication.field_az_publication_media
     - field.field.node.az_publication.field_az_publication_page
     - field.field.node.az_publication.field_az_publication_pmcid
@@ -176,6 +177,12 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  field_az_publication_mapped_type:
+    type: options_select
+    weight: 9
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   field_az_publication_media:
     type: media_library_widget
     weight: 29
@@ -215,12 +222,6 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  field_az_publication_type:
-    type: options_select
-    weight: 9
-    region: content
-    settings: {  }
-    third_party_settings: {  }
   field_az_publication_version:
     type: string_textfield
     weight: 14
@@ -287,4 +288,5 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-hidden: {  }
+hidden:
+  field_az_publication_type: true
diff --git a/modules/custom/az_publication/config/install/field.field.node.az_publication.field_az_publication_mapped_type.yml b/modules/custom/az_publication/config/install/field.field.node.az_publication.field_az_publication_mapped_type.yml
new file mode 100644
index 0000000000..9fac9079bb
--- /dev/null
+++ b/modules/custom/az_publication/config/install/field.field.node.az_publication.field_az_publication_mapped_type.yml
@@ -0,0 +1,23 @@
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_az_publication_mapped_type
+    - node.type.az_publication
+  enforced:
+    module:
+      - az_publication
+id: node.az_publication.field_az_publication_mapped_type
+field_name: field_az_publication_mapped_type
+entity_type: node
+bundle: az_publication
+label: Type
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:az_publication_type'
+  handler_settings: {  }
+field_type: entity_reference
diff --git a/modules/custom/az_publication/config/install/field.field.node.az_publication.field_az_publication_type.yml b/modules/custom/az_publication/config/install/field.field.node.az_publication.field_az_publication_type.yml
index 095aea9b3f..e57ce91aa9 100644
--- a/modules/custom/az_publication/config/install/field.field.node.az_publication.field_az_publication_type.yml
+++ b/modules/custom/az_publication/config/install/field.field.node.az_publication.field_az_publication_type.yml
@@ -11,12 +11,11 @@ field_name: field_az_publication_type
 entity_type: node
 bundle: az_publication
 label: 'Publication Type'
-description: ''
+description: 'This field was replaced by the field_az_publication_mapped_type field and can be safely deleted if az_publications update 1020902 finished without errors.'
 required: false
 translatable: true
 default_value:
-  -
-    value: article-journal
+  - value: article-journal
 default_value_callback: ''
 settings: {  }
 field_type: list_string
diff --git a/modules/custom/az_publication/config/install/field.storage.node.field_az_publication_mapped_type.yml b/modules/custom/az_publication/config/install/field.storage.node.field_az_publication_mapped_type.yml
new file mode 100644
index 0000000000..5ded6a147f
--- /dev/null
+++ b/modules/custom/az_publication/config/install/field.storage.node.field_az_publication_mapped_type.yml
@@ -0,0 +1,22 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - az_publication
+    - node
+  enforced:
+    module:
+      - az_publication
+id: node.field_az_publication_mapped_type
+field_name: field_az_publication_mapped_type
+entity_type: node
+type: entity_reference
+settings:
+  target_type: az_publication_type
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/modules/custom/az_publication/config/install/views.view.az_publications.yml b/modules/custom/az_publication/config/install/views.view.az_publications.yml
index fdb70a5401..ef9f9a46eb 100644
--- a/modules/custom/az_publication/config/install/views.view.az_publications.yml
+++ b/modules/custom/az_publication/config/install/views.view.az_publications.yml
@@ -13,7 +13,6 @@ dependencies:
     - datetime_range
     - draggableviews
     - node
-    - options
     - taxonomy
     - user
 id: az_publications
@@ -166,6 +165,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 25
           total_pages: null
           id: 0
@@ -183,7 +183,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       exposed_form:
         type: bef
         options:
@@ -412,7 +411,7 @@ display:
             operator: name_op
             operator_limit_selection: false
             operator_list: {  }
-            identifier: name
+            identifier: author_name
             required: false
             remember: false
             multiple: false
@@ -508,7 +507,7 @@ display:
             operator: field_az_publication_date_value_op
             operator_limit_selection: false
             operator_list: {  }
-            identifier: field_az_publication_date_value
+            identifier: date
             required: false
             remember: false
             multiple: false
@@ -536,33 +535,33 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           granularity: year
-        field_az_publication_type_value:
-          id: field_az_publication_type_value
-          table: node__field_az_publication_type
-          field: field_az_publication_type_value
+        field_az_publication_mapped_type_target_id:
+          id: field_az_publication_mapped_type_target_id
+          table: node__field_az_publication_mapped_type
+          field: field_az_publication_mapped_type_target_id
           relationship: none
           group_type: group
           admin_label: ''
-          plugin_id: list_field
+          plugin_id: entity_reference
           operator: or
           value: {  }
           group: 1
           exposed: true
           expose:
-            operator_id: field_az_publication_type_value_op
-            label: 'Publication Type'
+            operator_id: field_az_publication_mapped_type_target_id_op
+            label: Type
             description: ''
             use_operator: false
-            operator: field_az_publication_type_value_op
+            operator: field_az_publication_mapped_type_target_id_op
             operator_limit_selection: false
             operator_list: {  }
-            identifier: field_az_publication_type_value
+            identifier: type
             required: false
             remember: false
             multiple: false
             remember_roles:
-              authenticated: authenticated
               anonymous: '0'
+              authenticated: '0'
               az_content_editor: '0'
               az_content_admin: '0'
               az_user_admin: '0'
@@ -582,6 +581,11 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           reduce_duplicates: false
+          sub_handler: 'default:az_publication_type'
+          widget: select
+          sub_handler_settings:
+            target_bundles: null
+            auto_create: false
       filter_groups:
         operator: AND
         groups:
diff --git a/modules/custom/az_publication/config/schema/az_citation_style.schema.yml b/modules/custom/az_publication/config/schema/az_citation_style.schema.yml
index b9319d9fab..d2138629de 100644
--- a/modules/custom/az_publication/config/schema/az_citation_style.schema.yml
+++ b/modules/custom/az_publication/config/schema/az_citation_style.schema.yml
@@ -16,3 +16,4 @@ az_publication.az_citation_style.*:
       label: 'Custom'
     uuid:
       type: string
+      label: 'Universally Unique Identifier'
diff --git a/modules/custom/az_publication/config/schema/az_publication.schema.yml b/modules/custom/az_publication/config/schema/az_publication.schema.yml
index 912ba1b4bb..d0d547a5f6 100644
--- a/modules/custom/az_publication/config/schema/az_publication.schema.yml
+++ b/modules/custom/az_publication/config/schema/az_publication.schema.yml
@@ -4,4 +4,4 @@ az_publication.settings:
   mapping:
     default_citation_style:
       type: string
-      label: 'Default Citation Style'
+      label: 'Default Citation Style to be used throughout the site.'
diff --git a/modules/custom/az_publication/config/schema/az_publication_type.schema.yml b/modules/custom/az_publication/config/schema/az_publication_type.schema.yml
new file mode 100644
index 0000000000..f7eb3f8efc
--- /dev/null
+++ b/modules/custom/az_publication/config/schema/az_publication_type.schema.yml
@@ -0,0 +1,16 @@
+az_publication.type.*:
+  type: config_entity
+  label: 'Quickstart Publication Type config'
+  mapping:
+    id:
+      type: string
+      label: 'ID'
+    label:
+      type: label
+      label: 'Label'
+    type:
+      type: string
+      label: 'Mapped type'
+    uuid:
+      type: string
+      label: 'Universally Unique Identifier'
diff --git a/modules/custom/az_publication/src/AZPublicationTypeHtmlRouteProvider.php b/modules/custom/az_publication/src/AZPublicationTypeHtmlRouteProvider.php
new file mode 100644
index 0000000000..5fe5a3e27b
--- /dev/null
+++ b/modules/custom/az_publication/src/AZPublicationTypeHtmlRouteProvider.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\az_publication;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;
+use Symfony\Component\Routing\Route;
+
+/**
+ * Provides routes for Publication Type entities.
+ *
+ * @see Drupal\Core\Entity\Routing\AdminHtmlRouteProvider
+ * @see Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider
+ */
+class AZPublicationTypeHtmlRouteProvider extends AdminHtmlRouteProvider {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRoutes(EntityTypeInterface $entity_type) {
+    $collection = parent::getRoutes($entity_type);
+    // Set permissions required for the entity operations.
+    if ($route = $collection->get('entity.az_publication_type.delete-form')) {
+      $route->setRequirement('_permission', 'enable publication type entities');
+    }
+
+    // Define the 'enable' route.
+    $route = new Route('/admin/config/az-quickstart/settings/az-publication/{az_publication_type}/enable');
+    $route->setDefault('_controller', '\Drupal\az_publication\Controller\AZPublicationTypeController::ajaxOperation');
+    $route->setDefault('op', 'enable');
+    $route->setRequirement('_entity_access', 'az_publication_type.enable');
+    $route->setRequirement('_csrf_token', 'TRUE');
+    $collection->add('entity.az_publication_type.enable', $route);
+
+    // Define the 'disable' route.
+    $route = new Route('/admin/config/az-quickstart/settings/az-publication/{az_publication_type}/disable');
+    $route->setDefault('_controller', '\Drupal\az_publication\Controller\AZPublicationTypeController::ajaxOperation');
+    $route->setDefault('op', 'disable');
+    $route->setRequirement('_entity_access', 'az_publication_type.disable');
+    $route->setRequirement('_csrf_token', 'TRUE');
+    $collection->add('entity.az_publication_type.disable', $route);
+
+    return $collection;
+  }
+
+}
diff --git a/modules/custom/az_publication/src/AZPublicationTypeListBuilder.php b/modules/custom/az_publication/src/AZPublicationTypeListBuilder.php
new file mode 100644
index 0000000000..8035e03588
--- /dev/null
+++ b/modules/custom/az_publication/src/AZPublicationTypeListBuilder.php
@@ -0,0 +1,220 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\az_publication;
+
+use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Url;
+
+/**
+ * Provides a listing of Publication Type entities.
+ */
+class AZPublicationTypeListBuilder extends ConfigEntityListBuilder {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntityIds() {
+    $query = $this
+      ->getStorage()
+      ->getQuery()
+      ->sort('id', 'DESC');
+
+    // Only add the pager if a limit is specified.
+    if ($this->limit) {
+      $query->pager($this->limit);
+    }
+    return $query->execute();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDefaultOperations(EntityInterface $entity) {
+    $operations = parent::getDefaultOperations($entity);
+    $current_user = \Drupal::currentUser();
+    if (!$current_user->hasPermission('delete publication type entities') && isset($operations['delete'])) {
+      unset($operations['delete']);
+    }
+    if (!$current_user->hasPermission('disable publication type entities') && isset($operations['disable'])) {
+      unset($operations['disable']);
+    }
+    if (!$current_user->hasPermission('enable publication type entities') && isset($operations['enable'])) {
+      unset($operations['enable']);
+    }
+    // Ensure ajax.js focuses on appropriate element by setting
+    // data-drupal-selector.
+    foreach ($operations as &$operation) {
+      $operation['attributes']['data-drupal-selector'] = 'az-publication-type-listing-' . $entity->id();
+    }
+
+    return $operations;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function load() {
+    $entities = [
+      'enabled' => [],
+      'disabled' => [],
+    ];
+    foreach (parent::load() as $entity) {
+      /** @var \Drupal\az_publication\Entity\AZPublicationTypeInterface $entity */
+      if ($entity->get('status')) {
+        $entities['enabled'][] = $entity;
+      }
+      else {
+        $entities['disabled'][] = $entity;
+      }
+    }
+    return $entities;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildRow(EntityInterface $entity) {
+    /** @var \Drupal\az_publication\Entity\AZPublicationTypeInterface $entity */
+    $row = parent::buildRow($entity);
+    return [
+      'data' => [
+        'label' => [
+          'data' => [
+            '#plain_text' => $entity->label(),
+          ],
+        ],
+        'id' => [
+          'data' => [
+            '#plain_text' => $entity->id(),
+          ],
+        ],
+        'type' => [
+          'data' => [
+            '#plain_text' => $entity->get('type'),
+          ],
+        ],
+        'operations' => $row['operations'],
+      ],
+      '#attributes' => [
+        'class' => [$entity->get('status') ? 'az-publication-ui-list-enabled' : 'az-publication-ui-list-disabled'],
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildHeader() {
+    return [
+      'label' => [
+        'data' => $this->t('Label'),
+        'field' => 'label',
+        'specifier' => 'label',
+        '#attributes' => [
+          'class' => [
+            RESPONSIVE_PRIORITY_LOW,
+            'az-publication-type-label',
+          ],
+        ],
+      ],
+      'id' => [
+        'data' => $this->t('Machine name'),
+        'field' => 'id',
+        'specifier' => 'id',
+        '#attributes' => [
+          'class' => [
+            RESPONSIVE_PRIORITY_LOW,
+            'az-publication-type-machine-name',
+          ],
+        ],
+      ],
+      'type' => [
+        'data' => $this->t('Mapped CSL Type'),
+        'field' => 'type',
+        'specifier' => 'type',
+        '#attributes' => [
+          'class' => [
+            RESPONSIVE_PRIORITY_LOW,
+            'az-publication-type',
+          ],
+        ],
+      ],
+      'operations' => [
+        'data' => $this->t('Operations'),
+        '#attributes' => [
+          'class' => ['views-ui-operations'],
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function render() {
+    $entities = $this->load();
+    $list['#type'] = 'container';
+    $list['#attributes']['id'] = 'az-publication-type-entity-list';
+    $list['#attached']['library'][] = 'core/drupal.ajax';
+    $list['description'] = [
+      '#type' => 'markup',
+      '#markup' => $this->t('Tailor publication types to meet specific requirements and disable unused types to streamline the interface. For full documentation on how to use this feature, visit the <a href=":link" target="_blank">Quickstart documentation</a>.', [
+        ':link' => 'https://quickstart.arizona.edu/node/220',
+      ]),
+      '#prefix' => '<div class="az-publication-type-description">',
+      '#suffix' => '</div>',
+    ];
+
+    $list['filters'] = [
+      '#type' => 'container',
+      '#attributes' => [
+        'class' => [
+          'table-filter',
+          'js-show',
+        ],
+      ],
+    ];
+    $list['enabled']['heading']['#markup'] = '<h2>' . $this->t('Enabled', [], ['context' => 'Plural']) . '</h2>';
+    $list['disabled']['heading']['#markup'] = '<h2>' . $this->t('Disabled', [], ['context' => 'Plural']) . '</h2>';
+    foreach (['enabled', 'disabled'] as $status) {
+      $list[$status]['#type'] = 'container';
+      $list[$status]['#attributes'] = [
+        'class' => [
+          'az-publication-type-list-section',
+          $status,
+        ],
+      ];
+      $list[$status]['table'] = [
+        '#theme' => 'az_publication_type_listing_table',
+        '#headers' => $this->buildHeader(),
+        '#attributes' => [
+          'class' => [
+            'az-publication-type-listing-table',
+            $status,
+          ],
+        ],
+        '#rows' => [],
+      ];
+
+      if (!empty($entities[$status]) && is_array($entities[$status])) {
+        foreach ($entities[$status] as $entity) {
+          $row = $this->buildRow($entity);
+          if (is_array($row)) {
+            $list[$status]['table']['#rows'][$entity->id()] = $row;
+          }
+        }
+      }
+    }
+    $list['enabled']['table']['#empty'] = $this->t('There are no enabled publication types.');
+    $list['disabled']['table']['#empty'] = $this->t('There are no disabled publication types.');
+    $list['table']['#empty'] = $this->t('No publication types available. <a href=":url">Add publication type</a>.', [
+      ':url' => Url::fromRoute('entity.az_publication_type.add_form')->toString(),
+    ]);
+
+    return $list;
+  }
+
+}
diff --git a/modules/custom/az_publication/src/AZQuickstartCitationStyleHtmlRouteProvider.php b/modules/custom/az_publication/src/AZQuickstartCitationStyleHtmlRouteProvider.php
index 497c496bcc..22744a5ecf 100644
--- a/modules/custom/az_publication/src/AZQuickstartCitationStyleHtmlRouteProvider.php
+++ b/modules/custom/az_publication/src/AZQuickstartCitationStyleHtmlRouteProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\az_publication;
 
 use Drupal\Core\Entity\EntityTypeInterface;
diff --git a/modules/custom/az_publication/src/AZQuickstartCitationStyleListBuilder.php b/modules/custom/az_publication/src/AZQuickstartCitationStyleListBuilder.php
index ee78b8642e..b30fd96971 100644
--- a/modules/custom/az_publication/src/AZQuickstartCitationStyleListBuilder.php
+++ b/modules/custom/az_publication/src/AZQuickstartCitationStyleListBuilder.php
@@ -1,9 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\az_publication;
 
 use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Url;
 
 /**
  * Provides a listing of Quickstart Citation Style entities.
@@ -14,7 +17,7 @@ class AZQuickstartCitationStyleListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc}
    */
   public function buildHeader() {
-    $header['label'] = $this->t('Quickstart Citation Style');
+    $header['label'] = $this->t('Style name');
     $header['id'] = $this->t('Machine name');
     return $header + parent::buildHeader();
   }
@@ -28,4 +31,32 @@ public function buildRow(EntityInterface $entity) {
     return $row + parent::buildRow($entity);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function render() {
+    $parent_build = parent::render();
+
+    $build = [
+      'description' => [
+        '#type' => 'markup',
+        '#markup' => $this->t('Tailor citation styles to meet specific display requirements. For full documentation on how to use this feature, visit the <a href=":link" target="_blank">Quickstart documentation</a>.', [
+          ':link' => 'https://quickstart.arizona.edu/create-content/adding-publications',
+        ]),
+        '#prefix' => '<div class="az-publication-style-description">',
+        '#suffix' => '</div>',
+      ],
+    ];
+
+    $build += $parent_build;
+
+    if (isset($build['table'])) {
+      $build['table']['#empty'] = $this->t('No citation styles available. <a href=":url">Add citation style</a>.', [
+        ':url' => Url::fromRoute('entity.az_citation_style.add_form')->toString(),
+      ]);
+    }
+
+    return $build;
+  }
+
 }
diff --git a/modules/custom/az_publication/src/Controller/AZPublicationTypeController.php b/modules/custom/az_publication/src/Controller/AZPublicationTypeController.php
new file mode 100644
index 0000000000..eae4b88d3d
--- /dev/null
+++ b/modules/custom/az_publication/src/Controller/AZPublicationTypeController.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\az_publication\Controller;
+
+use Drupal\Core\Ajax\AjaxResponse;
+use Drupal\Core\Ajax\ReplaceCommand;
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\az_publication\Entity\AZPublicationType;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Controller for AJAX operations on AZPublicationType entities.
+ */
+class AZPublicationTypeController extends ControllerBase {
+
+  /**
+   * Performs an operation on an AZPublicationType and returns a response.
+   *
+   * This method handles AJAX operations for AZPublicationType entities.
+   * Depending on the request type, it either returns an AJAX response
+   * with a rendered entity list or redirects back to the list page.
+   *
+   * @param \Drupal\az_publication\Entity\AZPublicationType $az_publication_type
+   *   The AZPublicationType entity on which the operation is performed.
+   * @param string $op
+   *   The operation to perform. Expected to be a method name in
+   *   AZPublicationType.
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The current request object. Used to determine if the request is
+   *   an AJAX request.
+   *
+   * @return \Symfony\Component\HttpFoundation\Response
+   *   Returns an AjaxResponse if the request is an AJAX request, otherwise
+   *   a RedirectResponse.
+   */
+  public function ajaxOperation(AZPublicationType $az_publication_type, $op, Request $request) {
+    // Perform the operation.
+    if (method_exists($az_publication_type, $op)) {
+      $az_publication_type->$op()->save();
+    }
+
+    // If the request is via AJAX, return the rendered list as an AJAX response.
+    if ($request->request->get('js')) {
+      $list = $this->entityTypeManager()->getListBuilder('az_publication_type')->render();
+      $response = new AjaxResponse();
+      $response->addCommand(new ReplaceCommand('#az-publication-type-entity-list', $list));
+      return $response;
+    }
+
+    // For non-AJAX requests, redirect back to the list page.
+    return $this->redirect('entity.az_publication_type.collection');
+  }
+
+}
diff --git a/modules/custom/az_publication/src/Entity/AZPublicationType.php b/modules/custom/az_publication/src/Entity/AZPublicationType.php
new file mode 100644
index 0000000000..cfed9b61da
--- /dev/null
+++ b/modules/custom/az_publication/src/Entity/AZPublicationType.php
@@ -0,0 +1,147 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\az_publication\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityBase;
+
+/**
+ * Defines the publication type entity.
+ *
+ * @ConfigEntityType(
+ *   id = "az_publication_type",
+ *   label = @Translation("Publication type"),
+ *   label_collection = @Translation("Publication types"),
+ *   label_singular = @Translation("publication type"),
+ *   label_plural = @Translation("publication types"),
+ *   label_count = @PluralTranslation(
+ *     singular = "@count publication type",
+ *     plural = "@count publication types"
+ *   ),
+ *   handlers = {
+ *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
+ *     "list_builder" = "Drupal\az_publication\AZPublicationTypeListBuilder",
+ *     "form" = {
+ *       "add" = "Drupal\az_publication\Form\AZPublicationTypeForm",
+ *       "edit" = "Drupal\az_publication\Form\AZPublicationTypeForm",
+ *       "delete" = "Drupal\az_publication\Form\AZPublicationTypeDeleteForm"
+ *     },
+ *     "route_provider" = {
+ *       "html" = "Drupal\az_publication\AZPublicationTypeHtmlRouteProvider",
+ *     },
+ *   },
+ *   config_export = {
+ *     "id",
+ *     "label",
+ *     "type",
+ *     "uuid",
+ *     "status"
+ *   },
+ *   config_prefix = "type",
+ *   admin_permission = "administer publication type entities",
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "label" = "label",
+ *     "type" = "type",
+ *     "uuid" = "uuid",
+ *     "status" = "status",
+ *   },
+ *   links = {
+ *     "canonical" = "/admin/config/az-quickstart/settings/az-publication/type/{az_publication_type}",
+ *     "add-form" = "/admin/config/az-quickstart/settings/az-publication/type/add",
+ *     "edit-form" = "/admin/config/az-quickstart/settings/az-publication/type/{az_publication_type}/edit",
+ *     "delete-form" = "/admin/config/az-quickstart/settings/az-publication/type/{az_publication_type}/delete",
+ *     "enable" = "/admin/config/az-quickstart/settings/az-publication/type/{az_publication_type}/enable",
+ *     "disable" = "/admin/config/az-quickstart/settings/az-publication/type/{az_publication_type}/disable",
+ *     "collection" = "/admin/config/az-quickstart/settings/az-publication/types"
+ *   }
+ * )
+ */
+class AZPublicationType extends ConfigEntityBase implements AZPublicationTypeInterface {
+
+  /**
+   * The publication type ID.
+   *
+   * @var string
+   */
+  protected $id;
+
+  /**
+   * The publication type label.
+   *
+   * @var string
+   */
+  protected $label;
+
+  /**
+   * The publication type mapping.
+   *
+   * @var string
+   */
+  protected $type;
+
+  /**
+   * Gets the publication type mapping options.
+   *
+   * @return array
+   *   An associative array of publication type mapping options.
+   */
+  public static function getMappableTypeOptions():array {
+    return [
+      'article' => 'Article',
+      'article-journal' => 'Journal Article',
+      'article-magazine' => 'Magazine Article',
+      'article-newspaper' => 'Newspaper Article',
+      'bill' => 'Bill',
+      'book' => 'Book',
+      'broadcast' => 'Broadcast',
+      'chapter' => 'Chapter',
+      'classic' => 'Classic',
+      'collection' => 'Collection',
+      'dataset' => 'Dataset',
+      'document' => 'Document',
+      'entry' => 'Entry',
+      'entry-dictionary' => 'Dictionary Entry',
+      'entry-encyclopedia' => 'Encyclopedia Entry',
+      'event' => 'Event',
+      'figure' => 'Figure',
+      'graphic' => 'Graphic',
+      'hearing' => 'Hearing',
+      'interview' => 'Interview',
+      'legal_case' => 'Legal Case',
+      'legislation' => 'Legislation',
+      'manuscript' => 'Manuscript',
+      'map' => 'Map',
+      'motion_picture' => 'Motion Picture',
+      'musical_score' => 'Musical Score',
+      'pamphlet' => 'Pamphlet',
+      'paper-conference' => 'Conference Paper',
+      'patent' => 'Patent',
+      'performance' => 'Performance',
+      'periodical' => 'Periodical',
+      'personal_communication' => 'Personal Communication',
+      'post' => 'Post',
+      'post-weblog' => 'Weblog Post',
+      'regulation' => 'Regulation',
+      'report' => 'Report',
+      'review' => 'Review',
+      'review-book' => 'Book Review',
+      'software' => 'Software',
+      'song' => 'Song',
+      'speech' => 'Speech',
+      'standard' => 'Standard',
+      'thesis' => 'Thesis',
+      'treaty' => 'Treaty',
+      'webpage' => 'Webpage',
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function load($id): ?AZPublicationTypeInterface {
+    return \Drupal::entityTypeManager()->getStorage('az_publication_type')->load($id);
+  }
+
+}
diff --git a/modules/custom/az_publication/src/Entity/AZPublicationTypeInterface.php b/modules/custom/az_publication/src/Entity/AZPublicationTypeInterface.php
new file mode 100644
index 0000000000..192eff59d1
--- /dev/null
+++ b/modules/custom/az_publication/src/Entity/AZPublicationTypeInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\az_publication\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
+
+/**
+ * Provides an interface for defining Publication Type entities.
+ */
+interface AZPublicationTypeInterface extends ConfigEntityInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function load($id): ?AZPublicationTypeInterface;
+
+  /**
+   * Gets the publication type mapping options.
+   *
+   * @return array
+   *   An array of publication type mapping options.
+   */
+  public static function getMappableTypeOptions(): array;
+
+}
diff --git a/modules/custom/az_publication/src/Entity/AZQuickstartCitationStyle.php b/modules/custom/az_publication/src/Entity/AZQuickstartCitationStyle.php
index c137dbb1ce..87a2d98dd3 100644
--- a/modules/custom/az_publication/src/Entity/AZQuickstartCitationStyle.php
+++ b/modules/custom/az_publication/src/Entity/AZQuickstartCitationStyle.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\az_publication\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityBase;
@@ -11,13 +13,13 @@
  *
  * @ConfigEntityType(
  *   id = "az_citation_style",
- *   label = @Translation("Quickstart Citation Style"),
- *   label_collection = @Translation("Quickstart Citation Styles"),
- *   label_singular = @Translation("Quickstart Citation Style"),
- *   label_plural = @Translation("Quickstart Citation Styles"),
+ *   label = @Translation("Citation Style"),
+ *   label_collection = @Translation("Citation Styles"),
+ *   label_singular = @Translation("Citation Style"),
+ *   label_plural = @Translation("Citation Styles"),
  *   label_count = @PluralTranslation(
- *     singular = "@count Quickstart Citation Style",
- *     plural = "@count Quickstart Citation Styles"
+ *     singular = "@count Citation Style",
+ *     plural = "@count Citation Styles"
  *   ),
  *   handlers = {
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
@@ -45,11 +47,11 @@
  *     "uuid" = "uuid"
  *   },
  *   links = {
- *     "canonical" = "/admin/config/az-quickstart/settings/az-publication/az_citation_style/{az_citation_style}",
- *     "add-form" = "/admin/config/az-quickstart/settings/az-publication/az_citation_style/add",
- *     "edit-form" = "/admin/config/az-quickstart/settings/az-publication/az_citation_style/{az_citation_style}/edit",
- *     "delete-form" = "/admin/config/az-quickstart/settings/az-publication/az_citation_style/{az_citation_style}/delete",
- *     "collection" = "/admin/config/az-quickstart/settings/az-publication/az_citation_style"
+ *     "canonical" = "/admin/config/az-quickstart/settings/az-publication/style/{az_citation_style}",
+ *     "add-form" = "/admin/config/az-quickstart/settings/az-publication/style/add",
+ *     "edit-form" = "/admin/config/az-quickstart/settings/az-publication/style/{az_citation_style}/edit",
+ *     "delete-form" = "/admin/config/az-quickstart/settings/az-publication/style/{az_citation_style}/delete",
+ *     "collection" = "/admin/config/az-quickstart/settings/az-publication/styles"
  *   }
  * )
  */
diff --git a/modules/custom/az_publication/src/Form/AZPublicationTypeDeleteForm.php b/modules/custom/az_publication/src/Form/AZPublicationTypeDeleteForm.php
new file mode 100644
index 0000000000..24dfad3e82
--- /dev/null
+++ b/modules/custom/az_publication/src/Form/AZPublicationTypeDeleteForm.php
@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\az_publication\Form;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Entity\EntityConfirmFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Url;
+
+/**
+ * Builds the form to delete Quickstart Publication Type entities.
+ */
+class AZPublicationTypeDeleteForm extends EntityConfirmFormBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you want to delete %name?', ['%name' => $this->entity->label()]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCancelUrl() {
+    return new Url('entity.az_publication_type.collection');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return $this->t('Delete');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    $this->entity->delete();
+
+    $this->messenger()->addMessage(
+      $this->t('content @type: deleted @label.', [
+        '@type' => $this->entity->bundle(),
+        '@label' => $this->entity->label(),
+      ])
+    );
+
+    $form_state->setRedirectUrl($this->getCancelUrl());
+  }
+
+  /**
+   * Checks access for the delete form.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   The user account.
+   *
+   * @return \Drupal\Core\Access\AccessResult
+   *   The access result.
+   */
+  public function access(AccountInterface $account) {
+    // Check for the custom delete permission.
+    return $account->hasPermission('delete publication type entities') ? AccessResult::allowed() : AccessResult::forbidden();
+  }
+
+}
diff --git a/modules/custom/az_publication/src/Form/AZPublicationTypeForm.php b/modules/custom/az_publication/src/Form/AZPublicationTypeForm.php
new file mode 100644
index 0000000000..86021c7743
--- /dev/null
+++ b/modules/custom/az_publication/src/Form/AZPublicationTypeForm.php
@@ -0,0 +1,122 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\az_publication\Form;
+
+use Drupal\Core\Entity\EntityForm;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\az_publication\Entity\AZPublicationTypeInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Form controller for Publication Type add forms.
+ *
+ * @ingroup az_publication
+ */
+class AZPublicationTypeForm extends EntityForm {
+
+  /**
+   * The current user account.
+   *
+   * @var \Drupal\Core\Session\AccountProxyInterface
+   */
+  protected $account;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    // Instantiates this form class.
+    $instance = parent::create($container);
+    $instance->account = $container->get('current_user');
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function form(array $form, FormStateInterface $form_state) {
+    $form = parent::form($form, $form_state);
+
+    /** @var \Drupal\az_publication\Entity\AZPublicationTypeInterface $az_publication_type */
+    $az_publication_type = $this->entity;
+
+    $form['label'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Label'),
+      '#maxlength' => 255,
+      '#default_value' => $az_publication_type->label(),
+      '#description' => $this->t("Enter a descriptive label for the Publication Type. This label will be used as the identifier in lists and references throughout the system. Choose a name that clearly and concisely reflects the nature of the publication type. Keep it short yet descriptive."),
+      '#required' => TRUE,
+    ];
+
+    $form['id'] = [
+      '#type' => 'machine_name',
+      '#default_value' => $az_publication_type->id(),
+      '#machine_name' => [
+        'exists' => [\Drupal::entityTypeManager()->getStorage('az_publication_type'), 'load'],
+      ],
+      '#disabled' => !$az_publication_type->isNew(),
+    ];
+
+    $form['type'] = [
+      '#required' => TRUE,
+      '#type' => 'select',
+      '#title' => $this->t('CSL Type Mapping'),
+      '#options' => $az_publication_type->getMappableTypeOptions(),
+      '#default_value' => $az_publication_type->get('type'),
+      '#description' => $this->t('Select the type of publication this entry corresponds to. Each type aligns with the standards defined in the Citation Style Language (CSL). Your selection here will determine how the publication is formatted and displayed. For a detailed explanation of each type, refer to the CSL documentation: <a href=":csl-docs" target="_blank">CSL Types Specification</a>.', [
+        ':csl-docs' => 'https://docs.citationstyles.org/en/stable/specification.html#appendix-iii-types',
+      ]),
+    ];
+
+    $form['type'] += [
+      '#required' => TRUE,
+      '#prefix' => '<div id="mapping-wrapper">',
+      '#suffix' => '</div>',
+    ];
+
+    $form['status'] = [
+      '#title' => $this->t('Enabled'),
+      '#type' => 'checkbox',
+      '#default_value' => $az_publication_type->get('status'),
+      '#disabled' => !$az_publication_type->get('status'),
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    /** @var \Drupal\az_publication\Entity\AZPublicationTypeInterface $az_publication_type */
+    $az_publication_type = $this->entity;
+    // Ensure the entity is of the correct type.
+    if (!$az_publication_type instanceof AZPublicationTypeInterface) {
+      // Handle the case where $az_publication_type is not the expected type.
+      throw new \UnexpectedValueException("Unexpected entity type.");
+    }
+    // Retrieve and set the 'type' data.
+    $type = $form_state->getValue('type');
+    $az_publication_type->set('type', $type);
+    $status = $az_publication_type->save();
+
+    switch ($status) {
+      case SAVED_NEW:
+        $this->messenger()->addMessage($this->t('Created the %label Publication Type.', [
+          '%label' => $az_publication_type->label(),
+        ]));
+        break;
+
+      default:
+        $this->messenger()->addMessage($this->t('Saved the %label Publication Type.', [
+          '%label' => $az_publication_type->label(),
+        ]));
+    }
+    $form_state->setRedirectUrl($az_publication_type->toUrl('collection'));
+    return $status;
+  }
+
+}
diff --git a/modules/custom/az_publication/src/Plugin/EntityReferenceSelection/AZPublicationTypeSelection.php b/modules/custom/az_publication/src/Plugin/EntityReferenceSelection/AZPublicationTypeSelection.php
new file mode 100644
index 0000000000..1c471e6425
--- /dev/null
+++ b/modules/custom/az_publication/src/Plugin/EntityReferenceSelection/AZPublicationTypeSelection.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\az_publication\Plugin\EntityReferenceSelection;
+
+use Drupal\Core\Entity\Plugin\EntityReferenceSelection\DefaultSelection;
+
+/**
+ * Provides specific access control for the az_publication_type entity type.
+ *
+ * @EntityReferenceSelection(
+ *   id = "default:az_publication_type",
+ *   label = @Translation("AZ Publication Type selection"),
+ *   entity_types = {"az_publication_type"},
+ *   group = "default",
+ *   weight = 1
+ * )
+ */
+class AZPublicationTypeSelection extends DefaultSelection {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function buildEntityQuery($match = NULL, $match_operator = 'CONTAINS') {
+    $query = parent::buildEntityQuery($match, $match_operator);
+
+    // Add condition for status.
+    $query->condition('status', TRUE);
+
+    return $query;
+  }
+
+}
diff --git a/modules/custom/az_publication/templates/az-publication-type-listing-table.html.twig b/modules/custom/az_publication/templates/az-publication-type-listing-table.html.twig
new file mode 100644
index 0000000000..4b53443c12
--- /dev/null
+++ b/modules/custom/az_publication/templates/az-publication-type-listing-table.html.twig
@@ -0,0 +1,45 @@
+{#
+/**
+ * @file
+ * Default theme implementation for views listing table.
+ *
+ * Available variables:
+ * - headers: Contains table headers.
+ * - rows: Contains multiple rows. Each row contains:
+ *   - label: The human-readable name of the type.
+ *   - id: Machine name of the type.
+ *   - type: The mapped publication type.
+ *   - operations: List of available operations.
+ *
+ * @see template_preprocess_az_publication_type_listing_table()
+ *
+ * @ingroup themeable
+ */
+#}
+<table{{ attributes.addClass('responsive-enabled') }}>
+  <thead>
+    <tr>
+      {% for header in headers %}
+        <th{{ header.attributes }}>{{ header.data }}</th>
+      {% endfor %}
+    </tr>
+  </thead>
+  <tbody>
+    {% for row in rows %}
+      <tr{{ row.attributes }}>
+        <td class="az-publication-type-label">
+          <strong data-drupal-selector="az-publication-type-table-filter-text-source">{{ row.data.label.data }}</strong>
+        </td>
+        <td class="az-publication-type-machine-name" data-drupal-selector="az-publication-type-table-filter-text-source">
+          {{ row.data.id.data }}
+        </td>
+        <td class="az-publication-type" data-drupal-selector="az-publication-type-table-filter-text-source">
+          {{ row.data.type.data }}
+        </td>
+        <td class="az-publication-type-operations">
+          {{ row.data.operations.data }}
+        </td>
+      </tr>
+    {% endfor %}
+  </tbody>
+</table>
diff --git a/phpstan.neon b/phpstan.neon
index b182a5a92c..4cd90fa5c1 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -25,6 +25,8 @@ parameters:
 				class: Drupal\az_publication\Entity\AZAuthor
 			az_citation_style:
 				class: Drupal\az_publication\Entity\AZQuickstartCitationStyle
+			az_publication_type:
+				class: Drupal\az_publication\Entity\AZPublicationType
 			paragraph:
 				class: Drupal\paragraphs\Entity\Paragraph
 			paragraphs_type:

From 9e2463d79b7149fc409555c48e3ac85979a55f28 Mon Sep 17 00:00:00 2001
From: Joe Parsons <471936+joeparsons@users.noreply.github.com>
Date: Wed, 20 Nov 2024 15:02:35 -0700
Subject: [PATCH 23/41] #3893: Update drupal/core-recommended from 10.3.6 to
 10.3.9 (addresses multiple security advisories). (#3894)

---
 .probo.yaml   | 8 ++++----
 composer.json | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.probo.yaml b/.probo.yaml
index e93e0eed4d..875178bbad 100644
--- a/.probo.yaml
+++ b/.probo.yaml
@@ -50,16 +50,16 @@ steps:
     plugin: Script
     script:
       - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush -y -n pm:install az_demo
-      - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush user:create azcontenteditor --password="azcontenteditor2024"
+      - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush user:create azcontenteditor --password="azcontenteditor2024" --mail="azcontenteditor@example.com"
       - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush user:role:add az_content_editor azcontenteditor
-      - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush user:create azcontentadmin --password="azcontentadmin2024"
+      - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush user:create azcontentadmin --password="azcontentadmin2024" --mail="azcontentadmin@example.com"
       - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush user:role:add az_content_editor azcontentadmin
       - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush user:role:add az_content_admin azcontentadmin
-      - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush user:create azuseradmin --password="azuseradmin2024"
+      - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush user:create azuseradmin --password="azuseradmin2024" --mail="azuseradmin@example.com"
       - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush user:role:add az_content_editor azuseradmin
       - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush user:role:add az_content_admin azuseradmin
       - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush user:role:add az_user_admin azuseradmin
-      - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush user:create azhtmladmin --password="azhtmladmin2024"
+      - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush user:create azhtmladmin --password="azhtmladmin2024" --mail="azhtmladmin@example.com"
       - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush user:role:add az_content_editor azhtmladmin
       - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush user:role:add az_content_admin azhtmladmin
       - $SRC_DIR/az-quickstart-scaffolding/vendor/bin/drush user:role:add az_html_admin azhtmladmin
diff --git a/composer.json b/composer.json
index 0bcb03df90..41767f1452 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,7 @@
         "drupal/config_split": "2.0.1",
         "drupal/config_sync": "3.0.0-alpha3",
         "drupal/config_update": "2.0.0-alpha3",
-        "drupal/core-recommended": "10.3.6",
+        "drupal/core-recommended": "10.3.9",
         "drupal/crop": "2.4.0",
         "drupal/ctools": "*",
         "drupal/date_ap_style": "2.0.2",

From 8e87fb620b2ed149ce0ab2e8a92e81ee95cd4688 Mon Sep 17 00:00:00 2001
From: Dana Hertzberg <59745109+danahertzberg@users.noreply.github.com>
Date: Fri, 22 Nov 2024 12:23:29 -0500
Subject: [PATCH 24/41] Closes #3850: Update Quickstart content type views to
 have sticky at top of lists respected (#3851)

Co-authored-by: Brian Berndt <74572157+bberndt-uaz@users.noreply.github.com>
---
 .../config/install/views.view.az_events.yml   |  51 +++-
 .../quickstart/views.view.az_events.yml       |  49 ++++
 .../config/quickstart/views.view.az_news.yml  |  79 +++---
 .../views.view.az_page_by_category.yml        |  15 ++
 .../quickstart/views.view.az_person.yml       |  75 ++++++
 .../views.view.az_page_by_category.yml        | 249 ++++++++++--------
 .../config/install/views.view.az_news.yml     |  83 +++---
 .../config/install/views.view.az_person.yml   |  75 ++++++
 .../config/install/views.view.az_reorder.yml  |  84 +++++-
 9 files changed, 576 insertions(+), 184 deletions(-)

diff --git a/modules/custom/az_event/config/install/views.view.az_events.yml b/modules/custom/az_event/config/install/views.view.az_events.yml
index 12e0ab9b44..872fdace37 100644
--- a/modules/custom/az_event/config/install/views.view.az_events.yml
+++ b/modules/custom/az_event/config/install/views.view.az_events.yml
@@ -91,6 +91,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 10
           total_pages: null
           id: 0
@@ -108,7 +109,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 3
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:
@@ -141,6 +141,21 @@ display:
             format: az_standard
           tokenize: false
       sorts:
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
         field_az_event_date_value:
           id: field_az_event_date_value
           table: node__field_az_event_date
@@ -437,6 +452,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 12
           total_pages: null
           id: 0
@@ -454,7 +470,6 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
-          pagination_heading_level: h4
       sorts:
         field_az_event_date_value:
           id: field_az_event_date_value
@@ -602,6 +617,21 @@ display:
           offset: 0
           items_per_page: 3
       empty: {  }
+      sorts:
+        field_az_event_date_value:
+          id: field_az_event_date_value
+          table: node__field_az_event_date
+          field: field_az_event_date_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: date
+          order: ASC
+          expose:
+            label: ''
+            field_identifier: field_az_event_date_value
+          exposed: false
+          granularity: second
       arguments:
         term_node_tid_depth:
           id: term_node_tid_depth
@@ -688,6 +718,7 @@ display:
         empty: false
         title: false
         pager: false
+        sorts: false
         arguments: false
         pager_options: false
         header: false
@@ -736,6 +767,21 @@ display:
     display_plugin: page
     position: 1
     display_options:
+      sorts:
+        field_az_event_date_value:
+          id: field_az_event_date_value
+          table: node__field_az_event_date
+          field: field_az_event_date_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: date
+          order: ASC
+          expose:
+            label: ''
+            field_identifier: field_az_event_date_value
+          exposed: false
+          granularity: second
       filters:
         status:
           id: status
@@ -885,6 +931,7 @@ display:
         style: false
         style_options: false
         row: false
+        sorts: false
         filters: false
         filter_groups: false
       css_class: add-pager-top-margin
diff --git a/modules/custom/az_finder/config/quickstart/views.view.az_events.yml b/modules/custom/az_finder/config/quickstart/views.view.az_events.yml
index 965d73e8ca..b5190afb9e 100644
--- a/modules/custom/az_finder/config/quickstart/views.view.az_events.yml
+++ b/modules/custom/az_finder/config/quickstart/views.view.az_events.yml
@@ -92,6 +92,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 10
           total_pages: null
           id: 0
@@ -141,6 +142,21 @@ display:
             format: az_standard
           tokenize: false
       sorts:
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
         field_az_event_date_value:
           id: field_az_event_date_value
           table: node__field_az_event_date
@@ -885,6 +901,7 @@ display:
         type: full
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 12
           total_pages: null
           id: 0
@@ -1210,6 +1227,21 @@ display:
           offset: 0
           items_per_page: 3
       empty: {  }
+      sorts:
+        field_az_event_date_value:
+          id: field_az_event_date_value
+          table: node__field_az_event_date
+          field: field_az_event_date_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: date
+          order: ASC
+          expose:
+            label: ''
+            field_identifier: field_az_event_date_value
+          exposed: false
+          granularity: second
       arguments:
         term_node_tid_depth:
           id: term_node_tid_depth
@@ -1296,6 +1328,7 @@ display:
         empty: false
         title: false
         pager: false
+        sorts: false
         arguments: false
         pager_options: false
         header: false
@@ -1344,6 +1377,21 @@ display:
     display_plugin: page
     position: 1
     display_options:
+      sorts:
+        field_az_event_date_value:
+          id: field_az_event_date_value
+          table: node__field_az_event_date
+          field: field_az_event_date_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: date
+          order: ASC
+          expose:
+            label: ''
+            field_identifier: field_az_event_date_value
+          exposed: false
+          granularity: second
       filters:
         status:
           id: status
@@ -1493,6 +1541,7 @@ display:
         style: false
         style_options: false
         row: false
+        sorts: false
         filters: false
         filter_groups: false
       css_class: add-pager-top-margin
diff --git a/modules/custom/az_finder/config/quickstart/views.view.az_news.yml b/modules/custom/az_finder/config/quickstart/views.view.az_news.yml
index d792289e00..7d4002093d 100644
--- a/modules/custom/az_finder/config/quickstart/views.view.az_news.yml
+++ b/modules/custom/az_finder/config/quickstart/views.view.az_news.yml
@@ -124,6 +124,21 @@ display:
         options: {  }
       empty: {  }
       sorts:
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: sticky
+          exposed: false
         field_az_published_value:
           id: field_az_published_value
           table: node__field_az_published
@@ -265,36 +280,6 @@ display:
         options:
           offset: 0
           items_per_page: 1
-      sorts:
-        sticky:
-          id: sticky
-          table: node_field_data
-          field: sticky
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: sticky
-          plugin_id: standard
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: sticky
-          exposed: false
-        field_az_published_value:
-          id: field_az_published_value
-          table: node__field_az_published
-          field: field_az_published_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: datetime
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: field_az_published_value
-          exposed: false
-          granularity: second
       style:
         type: default
         options:
@@ -311,7 +296,7 @@ display:
         style: false
         style_options: false
         row: false
-        sorts: false
+        sorts: true
         pager_options: false
       display_description: ''
       pager_options: null
@@ -1139,6 +1124,37 @@ display:
         options:
           offset: 0
           items_per_page: 3
+      sorts:
+        field_az_published_value:
+          id: field_az_published_value
+          table: node__field_az_published
+          field: field_az_published_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: datetime
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: field_az_published_value
+          exposed: false
+          granularity: second
+        created:
+          id: created
+          table: node_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: created
+          plugin_id: date
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: created
+          exposed: false
+          granularity: second
       arguments:
         term_node_tid_depth:
           id: term_node_tid_depth
@@ -1266,6 +1282,7 @@ display:
         pager: false
         style: false
         row: false
+        sorts: false
         arguments: false
         filters: false
         filter_groups: false
diff --git a/modules/custom/az_finder/config/quickstart/views.view.az_page_by_category.yml b/modules/custom/az_finder/config/quickstart/views.view.az_page_by_category.yml
index 029f13a6ba..2db1855554 100644
--- a/modules/custom/az_finder/config/quickstart/views.view.az_page_by_category.yml
+++ b/modules/custom/az_finder/config/quickstart/views.view.az_page_by_category.yml
@@ -186,6 +186,21 @@ display:
             format: az_standard
           tokenize: false
       sorts:
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
         title:
           id: title
           table: node_field_data
diff --git a/modules/custom/az_finder/config/quickstart/views.view.az_person.yml b/modules/custom/az_finder/config/quickstart/views.view.az_person.yml
index be64cbb392..6b3e06bc46 100644
--- a/modules/custom/az_finder/config/quickstart/views.view.az_person.yml
+++ b/modules/custom/az_finder/config/quickstart/views.view.az_person.yml
@@ -588,6 +588,21 @@ display:
           separator: ', '
           field_api_classes: false
       sorts:
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
         weight:
           id: weight
           table: draggableviews_structure
@@ -743,6 +758,21 @@ display:
           separator: ', '
           field_api_classes: false
       sorts:
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
         weight:
           id: weight
           table: draggableviews_structure
@@ -1683,6 +1713,21 @@ display:
           empty_zero: false
           hide_alter_empty: false
       sorts:
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
         weight:
           id: weight
           table: draggableviews_structure
@@ -2632,6 +2677,21 @@ display:
           empty_zero: false
           hide_alter_empty: false
       sorts:
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
         weight:
           id: weight
           table: draggableviews_structure
@@ -2730,6 +2790,21 @@ display:
     position: 3
     display_options:
       sorts:
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
         weight:
           id: weight
           table: draggableviews_structure
diff --git a/modules/custom/az_flexible_page/config/install/views.view.az_page_by_category.yml b/modules/custom/az_flexible_page/config/install/views.view.az_page_by_category.yml
index 7eebedb51d..2db7d13241 100644
--- a/modules/custom/az_flexible_page/config/install/views.view.az_page_by_category.yml
+++ b/modules/custom/az_flexible_page/config/install/views.view.az_page_by_category.yml
@@ -22,73 +22,12 @@ base_table: node_field_data
 base_field: nid
 display:
   default:
-    display_plugin: default
     id: default
     display_title: Master
+    display_plugin: default
     position: 0
     display_options:
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      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: Apply
-          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: full
-        options:
-          items_per_page: 50
-          offset: 0
-          id: 0
-          total_pages: null
-          tags:
-            previous: '‹ Previous'
-            next: 'Next ›'
-            first: '« First'
-            last: 'Last »'
-          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
-          quantity: 9
-          pagination_heading_level: h4
-      style:
-        type: default
-        options:
-          grouping:
-            -
-              field: field_az_page_category
-              rendered: true
-              rendered_strip: true
-          row_class: ''
-          default_row_class: false
-          uses_fields: true
-      row:
-        type: 'entity:node'
-        options:
-          view_mode: teaser
+      title: ''
       fields:
         field_az_page_category:
           id: field_az_page_category
@@ -97,6 +36,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: field
           label: ''
           exclude: false
           alter:
@@ -152,34 +92,62 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          plugin_id: field
-      filters:
-        status:
-          value: '1'
-          table: node_field_data
-          field: status
-          plugin_id: boolean
-          entity_type: node
-          entity_field: status
-          id: status
+      pager:
+        type: full
+        options:
+          offset: 0
+          pagination_heading_level: h4
+          items_per_page: 50
+          total_pages: null
+          id: 0
+          tags:
+            next: 'Next ›'
+            previous: '‹ Previous'
+            first: '« First'
+            last: 'Last »'
           expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-          group: 1
-        type:
-          id: type
+            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
+          quantity: 9
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      empty: {  }
+      sorts:
+        sticky:
+          id: sticky
           table: node_field_data
-          field: type
-          value:
-            az_flexible_page: az_flexible_page
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
           entity_type: node
-          entity_field: type
-          plugin_id: bundle
+          entity_field: sticky
+          plugin_id: standard
+          order: DESC
           expose:
-            operator_limit_selection: false
-            operator_list: {  }
-      sorts:
+            label: ''
+            field_identifier: ''
+          exposed: false
         title:
           id: title
           table: node_field_data
@@ -187,19 +155,14 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: title
+          plugin_id: standard
           order: ASC
-          exposed: false
           expose:
             label: ''
             field_identifier: title
-          entity_type: node
-          entity_field: title
-          plugin_id: standard
-      title: ''
-      header: {  }
-      footer: {  }
-      empty: {  }
-      relationships: {  }
+          exposed: false
       arguments:
         tid:
           id: tid
@@ -208,6 +171,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: taxonomy_index_tid
           default_action: ignore
           exception:
             value: all
@@ -221,8 +185,8 @@ display:
           summary_options:
             base_path: ''
             count: true
-            items_per_page: 25
             override: false
+            items_per_page: 25
           summary:
             sort_order: asc
             number_of_records: 0
@@ -234,16 +198,67 @@ display:
           validate_options:
             bundles:
               az_page_categories: az_page_categories
+            access: false
             operation: view
             multiple: 1
-            access: false
           break_phrase: true
           add_table: false
           require_value: false
           reduce_duplicates: true
-          plugin_id: taxonomy_index_tid
-      display_extenders: {  }
+      filters:
+        status:
+          id: status
+          table: node_field_data
+          field: status
+          entity_type: node
+          entity_field: status
+          plugin_id: boolean
+          value: '1'
+          group: 1
+          expose:
+            operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
+        type:
+          id: type
+          table: node_field_data
+          field: type
+          entity_type: node
+          entity_field: type
+          plugin_id: bundle
+          value:
+            az_flexible_page: az_flexible_page
+          expose:
+            operator_limit_selection: false
+            operator_list: {  }
+      style:
+        type: default
+        options:
+          grouping:
+            -
+              field: field_az_page_category
+              rendered: true
+              rendered_strip: true
+          row_class: ''
+          default_row_class: false
+          uses_fields: true
+      row:
+        type: 'entity:node'
+        options:
+          view_mode: teaser
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      relationships: {  }
       group_by: false
+      header: {  }
+      footer: {  }
+      display_extenders: {  }
     cache_metadata:
       max-age: -1
       contexts:
@@ -256,13 +271,11 @@ display:
       tags:
         - 'config:field.storage.node.field_az_page_category'
   grid:
-    display_plugin: page
     id: grid
     display_title: 'Grid Page'
+    display_plugin: page
     position: 2
     display_options:
-      display_extenders: {  }
-      display_description: ''
       style:
         type: views_bootstrap_grid
         options:
@@ -275,16 +288,18 @@ display:
           col_md: col-md-4
           col_lg: col-lg-4
           col_xl: col-xl-4
-      defaults:
-        style: false
-        row: false
-        style_options: false
       row:
         type: 'entity:node'
         options:
           relationship: none
           view_mode: az_card
+      defaults:
+        style: false
+        style_options: false
+        row: false
+      display_description: ''
       style_options: null
+      display_extenders: {  }
       path: page-grid
     cache_metadata:
       max-age: -1
@@ -298,32 +313,32 @@ display:
       tags:
         - 'config:field.storage.node.field_az_page_category'
   row:
-    display_plugin: page
     id: row
     display_title: 'Row Page'
+    display_plugin: page
     position: 1
     display_options:
-      display_extenders: {  }
-      path: page-list
-      display_description: ''
       style:
         type: default
         options:
           row_class: ''
           default_row_class: false
           uses_fields: false
-      defaults:
-        css_class: false
-        style: false
-        row: false
-        style_options: false
-      css_class: add-pager-top-margin
       row:
         type: 'entity:node'
         options:
           relationship: none
           view_mode: az_row
+      defaults:
+        css_class: false
+        style: false
+        style_options: false
+        row: false
+      css_class: add-pager-top-margin
+      display_description: ''
       style_options: null
+      display_extenders: {  }
+      path: page-list
     cache_metadata:
       max-age: -1
       contexts:
diff --git a/modules/custom/az_news/config/install/views.view.az_news.yml b/modules/custom/az_news/config/install/views.view.az_news.yml
index 5a7602780c..e88097093f 100644
--- a/modules/custom/az_news/config/install/views.view.az_news.yml
+++ b/modules/custom/az_news/config/install/views.view.az_news.yml
@@ -122,6 +122,21 @@ display:
         options: {  }
       empty: {  }
       sorts:
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
         field_az_published_value:
           id: field_az_published_value
           table: node__field_az_published
@@ -149,7 +164,7 @@ display:
           order: DESC
           expose:
             label: ''
-            field_identifier: created
+            field_identifier: ''
           exposed: false
           granularity: second
       arguments:
@@ -263,36 +278,6 @@ display:
         options:
           offset: 0
           items_per_page: 1
-      sorts:
-        sticky:
-          id: sticky
-          table: node_field_data
-          field: sticky
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: sticky
-          plugin_id: standard
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: sticky
-          exposed: false
-        field_az_published_value:
-          id: field_az_published_value
-          table: node__field_az_published
-          field: field_az_published_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: datetime
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: field_az_published_value
-          exposed: false
-          granularity: second
       style:
         type: default
         options:
@@ -309,7 +294,7 @@ display:
         style: false
         style_options: false
         row: false
-        sorts: false
+        sorts: true
         pager_options: false
       display_description: ''
       pager_options: null
@@ -632,6 +617,37 @@ display:
         options:
           offset: 0
           items_per_page: 3
+      sorts:
+        field_az_published_value:
+          id: field_az_published_value
+          table: node__field_az_published
+          field: field_az_published_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: datetime
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: field_az_published_value
+          exposed: false
+          granularity: second
+        created:
+          id: created
+          table: node_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: created
+          plugin_id: date
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
+          granularity: second
       arguments:
         term_node_tid_depth:
           id: term_node_tid_depth
@@ -759,6 +775,7 @@ display:
         pager: false
         style: false
         row: false
+        sorts: false
         arguments: false
         filters: false
         filter_groups: false
@@ -918,7 +935,7 @@ display:
         filter_groups: false
       display_description: ''
       display_extenders: {  }
-      block_description: 'Sidebar News Block'
+      block_description: 'Small Row News Block'
     cache_metadata:
       max-age: -1
       contexts:
diff --git a/modules/custom/az_person/config/install/views.view.az_person.yml b/modules/custom/az_person/config/install/views.view.az_person.yml
index 027c5e32fc..14bfba2534 100644
--- a/modules/custom/az_person/config/install/views.view.az_person.yml
+++ b/modules/custom/az_person/config/install/views.view.az_person.yml
@@ -377,6 +377,21 @@ display:
           separator: ', '
           field_api_classes: false
       sorts:
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
         weight:
           id: weight
           table: draggableviews_structure
@@ -530,6 +545,21 @@ display:
           separator: ', '
           field_api_classes: false
       sorts:
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
         weight:
           id: weight
           table: draggableviews_structure
@@ -1469,6 +1499,21 @@ display:
           empty_zero: false
           hide_alter_empty: false
       sorts:
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
         weight:
           id: weight
           table: draggableviews_structure
@@ -2417,6 +2462,21 @@ display:
           empty_zero: false
           hide_alter_empty: false
       sorts:
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
         weight:
           id: weight
           table: draggableviews_structure
@@ -2514,6 +2574,21 @@ display:
     position: 3
     display_options:
       sorts:
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
         weight:
           id: weight
           table: draggableviews_structure
diff --git a/modules/custom/az_person/config/install/views.view.az_reorder.yml b/modules/custom/az_person/config/install/views.view.az_reorder.yml
index 0ecdb063e7..bb19333f63 100644
--- a/modules/custom/az_person/config/install/views.view.az_reorder.yml
+++ b/modules/custom/az_person/config/install/views.view.az_reorder.yml
@@ -206,6 +206,73 @@ display:
           action_title: Action
           include_exclude: exclude
           selected_actions: null
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: field
+          label: 'Sticky at top of lists'
+          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: boolean
+          settings:
+            format: yes-no
+            format_custom_false: ''
+            format_custom_true: ''
+          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
       pager:
         type: none
         options:
@@ -230,6 +297,21 @@ display:
         options: {  }
       empty: {  }
       sorts:
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: ''
+          exposed: false
         weight:
           id: weight
           table: draggableviews_structure
@@ -390,7 +472,7 @@ display:
           plugin_id: text
           empty: true
           content:
-            value: '<p><strong>Note:</strong> Changing the sort order will override default alphabetical ordering.</p>'
+            value: "<p><strong>Note:</strong> Changing the sort order will override default alphabetical ordering.</p>\r\n<p><strong>Note:</strong> Sticky at top of lists option is set on the specific person.</p>"
             format: az_standard
           tokenize: false
       footer:

From e8538a9e73349c345d9344edac8c9ee73951fd12 Mon Sep 17 00:00:00 2001
From: Dana Hertzberg <59745109+danahertzberg@users.noreply.github.com>
Date: Fri, 22 Nov 2024 12:27:32 -0500
Subject: [PATCH 25/41] Closes #3391: Hyperlink Land Acknowledgement text in
 the Global Footer (#3400)

Co-authored-by: Brian Berndt <74572157+bberndt-uaz@users.noreply.github.com>
---
 themes/custom/az_barrio/az_barrio.theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/custom/az_barrio/az_barrio.theme b/themes/custom/az_barrio/az_barrio.theme
index 90bed57c9c..80a8f97164 100644
--- a/themes/custom/az_barrio/az_barrio.theme
+++ b/themes/custom/az_barrio/az_barrio.theme
@@ -130,7 +130,7 @@ function az_barrio_preprocess_page(&$variables, $hook) {
   // Check if land acknowledgment should be displayed.
   $land_acknowledgment = '';
   if (theme_get_setting('land_acknowledgment')) {
-    $land_acknowledgment = '<p class="font-weight-light"><em>We respectfully acknowledge the University of Arizona is on the land and territories of Indigenous peoples. Today, Arizona is home to 22 federally recognized tribes, with Tucson being home to the O’odham and the Yaqui. Committed to diversity and inclusion, the University strives to build sustainable relationships with sovereign Native Nations and Indigenous communities through education offerings, partnerships, and community service.</em></p><hr>';
+    $land_acknowledgment = '<p class="font-weight-light"><em>We respectfully acknowledge <a href="https://www.arizona.edu/university-arizona-land-acknowledgment">the University of Arizona is on the land and territories of Indigenous peoples</a>. Today, Arizona is home to 22 federally recognized tribes, with Tucson being home to the O’odham and the Yaqui. Committed to diversity and inclusion, the University strives to build sustainable relationships with sovereign Native Nations and Indigenous communities through education offerings, partnerships, and community service.</em></p><hr>';
   }
 
   // Check if information security policy should be displayed.

From bd7af3d11b7af62e68dcccc1c96251bb4bf908df Mon Sep 17 00:00:00 2001
From: Chris Green <chrisgreen@arizona.edu>
Date: Fri, 22 Nov 2024 11:13:44 -0700
Subject: [PATCH 26/41] Close #3903 Add schema_metatag module as dependency of
 az_seo (#3909)

---
 composer.json                         | 1 +
 modules/custom/az_seo/az_seo.info.yml | 1 +
 modules/custom/az_seo/az_seo.install  | 7 +++++++
 3 files changed, 9 insertions(+)

diff --git a/composer.json b/composer.json
index 41767f1452..9e5391e78a 100644
--- a/composer.json
+++ b/composer.json
@@ -105,6 +105,7 @@
         "drupal/quick_node_clone": "1.17.0",
         "drupal/redirect": "1.10.0",
         "drupal/role_delegation": "1.3.0",
+        "drupal/schema_metatag": "3.0.3",
         "drupal/search_exclude": "3.0.0-beta1",
         "drupal/seckit": "2.0.3",
         "drupal/slick": "3.0.4",
diff --git a/modules/custom/az_seo/az_seo.info.yml b/modules/custom/az_seo/az_seo.info.yml
index 6bfecb0c5e..824495a007 100644
--- a/modules/custom/az_seo/az_seo.info.yml
+++ b/modules/custom/az_seo/az_seo.info.yml
@@ -10,3 +10,4 @@ dependencies:
   - metatag:metatag
   - metatag:metatag_open_graph
   - metatag:metatag_twitter_cards
+  - schema_metatag:schema_metatag
diff --git a/modules/custom/az_seo/az_seo.install b/modules/custom/az_seo/az_seo.install
index 47be1705b1..5894eccb56 100644
--- a/modules/custom/az_seo/az_seo.install
+++ b/modules/custom/az_seo/az_seo.install
@@ -20,3 +20,10 @@ function az_seo_update_last_removed() {
  */
 function az_seo_update_1021001() {
 }
+
+/**
+ * Ensure schema_metatag module is installed.
+ */
+function az_seo_update_1021101() {
+  \Drupal::service('module_installer')->install(['schema_metatag']);
+}

From 2c68cecbdf42b05bfade71afac17123b1b03c17a Mon Sep 17 00:00:00 2001
From: Bao Nguyen <88011047+BaoNguyen09@users.noreply.github.com>
Date: Fri, 22 Nov 2024 11:44:25 -0700
Subject: [PATCH 27/41] Closes #485 Remove unused CSS files in az_flexible_page
 module (#3892)

---
 .../az_flexible_page/css/az_flexible_page.css | 82 -------------------
 .../css/az_flexible_page_layout.css           | 53 ------------
 2 files changed, 135 deletions(-)
 delete mode 100644 modules/custom/az_flexible_page/css/az_flexible_page.css
 delete mode 100644 modules/custom/az_flexible_page/css/az_flexible_page_layout.css

diff --git a/modules/custom/az_flexible_page/css/az_flexible_page.css b/modules/custom/az_flexible_page/css/az_flexible_page.css
deleted file mode 100644
index d360e6d6a4..0000000000
--- a/modules/custom/az_flexible_page/css/az_flexible_page.css
+++ /dev/null
@@ -1,82 +0,0 @@
-.ds-1col,
-.ds-2col,
-.ds-3col,
-.ds-3col-equal,
-.ds-4col {
-  /*
-  *  Make columns position relative to ensure background images
-  *  respond properly to their "parent" container.
-  *
-  *  FUTURE IMPROVEMENT: Include this with our custom layouts.
-  */
-  position: relative;
-}
-
-.component-w-50 {
-  /*
-  *  Make component's width 50%. Different from AZ Bootstrap's .w-50
-  *  because it includes media queries for mobile.
-  */
-  width: 100%;
-}
-
-.full-width-wrapper {
-  /*
-  *  Make component 100% of viewport width, and translate it left
-  *  to keep it within the viewport.
-  */
-  position: relative;
-  width: 100vw;
-  left: 50%;
-  transform: translateX(-50%);
-}
-
-.card-deck .card p:last-child {
-  /*
-  *  Remove extra whitespace.
-  *
-  *  NOTE: Consider adding this to Bootstrap instead? */
-  margin: 0;
-}
-
-/* MEDIA QUERIES */
-
-/* @min-width 576px */
-@media (min-width: 576px) {
-  .card-deck {
-    flex-flow: column;
-  }
-  .card-deck .card {
-    margin-bottom: 15px;
-  }
-  .block-inline-blockaz-text-area[class^="bg-"] {
-    padding: 3rem;
-  }
-  .card-deck .card-body {
-    padding: 2.5rem;
-  }
-}
-
-/* @min-width 768px */
-@media (min-width: 768px) {
-  .component-w-50 {
-    width: 65%;
-  }
-}
-
-/* @min-width 992px */
-@media (min-width: 992px) {
-  .card-deck {
-    flex-flow: row wrap;
-  }
-  .component-w-50 {
-    width: 50%;
-  }
-}
-
-/* @min-width 576px */
-@media (min-width: 576px) {
-  .card-deck .card {
-    margin-bottom: 25px;
-  }
-}
diff --git a/modules/custom/az_flexible_page/css/az_flexible_page_layout.css b/modules/custom/az_flexible_page/css/az_flexible_page_layout.css
deleted file mode 100644
index 6f149c8e57..0000000000
--- a/modules/custom/az_flexible_page/css/az_flexible_page_layout.css
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-*  LAYOUT BUILDER - BLOCK EDIT FORM
-*
-*  Overrides to improve the editor UX and fix weird quirks with regards to
-*  the different components. Especially with regards to Background Images.
-*/
-.node--type-az-flexible-page #layout-builder .layout-builder-block {
-  /* Set z-index for components, to ensure they stay above background images. */
-  z-index: 1;
-}
-.node--type-az-flexible-page #layout-builder .layout-builder-block.block-inline-blockaz-background-image {
-  /* Reset z-index so component is interactable. */
-  z-index: 0;
-  min-height: 250px;
-}
-.node--type-az-flexible-page #layout-builder .block-inline-blockaz-background-image:not(".full-width-wrapper") {
-  /* Keep background Image component aligned properly. */
-  left: 0;
-}
-.node--type-az-flexible-page #layout-builder .layout-builder__layout.justify-content-md-end {
-  /*
-  *  Prevent overlap of "add block" and "configure" link for justified right sections.
-  *  Necessary for the Bckground Image component.
-  */
-  align-items: center;
-}
-.node--type-az-flexible-page #layout-builder .layout-builder__layout:not([class*="py-"]),
-.node--type-az-flexible-page #layout-builder .layout-builder__layout:not(".justify-content-md-end") {
-  /*
-  *  Target sections with no vertical padding, and add right padding.
-  *  Prevents non-full-width Background Images' "configure" link from being obstructed.
-  */
-  padding-right: 7rem;
-}
-.node--type-az-flexible-page #layout-builder .block-inline-blockaz-accordion {
-  /* Increase padding between Accordions to make editing easier. */
-  padding: .5em 1.5em;
-}
-
-.node--type-az-flexible-page #layout-builder .layout-builder__link--configure {
-  position: relative;
-  z-index: 5;
-  box-sizing: border-box;
-  padding: 5px;
-  background-color: rgba(255,255,255,.7);
-}
-.node--type-az-flexible-page #layout-builder .layout-builder__section {
-  min-height: 250px;
-}
-.node--type-az-flexible-page #layout-builder .layout-builder-block:not([class*="bg-"]) {
-  /* prevent floated images from "disappearing" behind white background of sibling components */
-  background-color: initial;
-}

From d2d9e6daba0a4b36e8fa12902d1fe31fdcfee040 Mon Sep 17 00:00:00 2001
From: Bao Nguyen <88011047+BaoNguyen09@users.noreply.github.com>
Date: Wed, 4 Dec 2024 10:24:27 -0700
Subject: [PATCH 28/41] Closes #3865 Fix the No Results text for the AZ Events
 Past Grid View with Images view display (#3884)

Co-authored-by: Brian Berndt <74572157+bberndt-uaz@users.noreply.github.com>
Co-authored-by: Chris Green <chrisgreen@arizona.edu>
---
 .../config/install/views.view.az_events.yml       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/modules/custom/az_event/config/install/views.view.az_events.yml b/modules/custom/az_event/config/install/views.view.az_events.yml
index 872fdace37..5e24e12d47 100644
--- a/modules/custom/az_event/config/install/views.view.az_events.yml
+++ b/modules/custom/az_event/config/install/views.view.az_events.yml
@@ -470,6 +470,20 @@ display:
             offset: false
             offset_label: Offset
           quantity: 9
+      empty:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: text
+          empty: true
+          content:
+            value: '<em>There are no past events listed.</em>'
+            format: az_standard
+          tokenize: false
       sorts:
         field_az_event_date_value:
           id: field_az_event_date_value
@@ -578,6 +592,7 @@ display:
           relationship: none
           view_mode: az_card_alternate
       defaults:
+        empty: false
         title: false
         pager: false
         style: false

From 0bb20e6e697b70e8d44848cb8d8c8e7568c6aed9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2024 10:37:35 -0700
Subject: [PATCH 29/41] Update drupal/intelligencebank requirement from 4.1.1
 to 5.1.0 (#3849)

Updates the requirements on drupal/intelligencebank to permit the latest version.

---
updated-dependencies:
- dependency-name: drupal/intelligencebank
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9e5391e78a..dfb4423f16 100644
--- a/composer.json
+++ b/composer.json
@@ -80,7 +80,7 @@
         "drupal/image_widget_crop": "2.4.0",
         "drupal/imagemagick": "4.0.2",
         "drupal/inline_entity_form": "3.0.0-rc20",
-        "drupal/intelligencebank": "4.1.1",
+        "drupal/intelligencebank": "5.1.0",
         "drupal/jquery_ui": "1.7.0",
         "drupal/jquery_ui_datepicker": "2.1.1",
         "drupal/jquery_ui_slider": "*",

From 4e50647b034a9257db8b589e06e3b950e84c017a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2024 10:38:00 -0700
Subject: [PATCH 30/41] Update drupal/ckeditor_indentblock requirement from 1.0
 to 1.1.0 (#3900)

* Update drupal/ckeditor_indentblock requirement from 1.0 to 1.1.0

Updates the requirements on drupal/ckeditor_indentblock to permit the latest version.

---
updated-dependencies:
- dependency-name: drupal/ckeditor_indentblock
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Remove no-longer-needed patches.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joe Parsons <471936+joeparsons@users.noreply.github.com>
---
 composer.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index dfb4423f16..1d2009ede4 100644
--- a/composer.json
+++ b/composer.json
@@ -49,7 +49,7 @@
         "drupal/cas": "2.3.2",
         "drupal/chosen": "4.0.3",
         "drupal/ckeditor_bs_grid": "2.0.12",
-        "drupal/ckeditor_indentblock": "1.0",
+        "drupal/ckeditor_indentblock": "1.1.0",
         "drupal/coffee": "2.0.0",
         "drupal/config_distro": "2.0.0-alpha2",
         "drupal/config_ignore": "3.3.0",
@@ -153,10 +153,6 @@
             "drupal/cas": {
                 "ServiceNotFoundException when logging out (2948185)": "https://www.drupal.org/files/issues/cas_logout_error-2948185-2.patch"
             },
-            "drupal/ckeditor_indentblock": {
-                "Symfony\\Component\\Validator\\Exception\\LogicException: The LangcodeRequiredIfTranslatableValues constraint can only operate on the root object being validated. (3457094)": "https://www.drupal.org/files/issues/2024-07-25/ckeditor_indentblock-3457094-schema-error.patch",
-                "Plugin blocks other classes on P elements (3402570)": "https://www.drupal.org/files/issues/2024-05-15/ckeditor_indentblock-class-names-3402570-6.patch"
-            },
             "drupal/config_distro": {
                 "Storage comparer issue": "https://gist.githubusercontent.com/tadean/e2e0dd57f1a9c4eae28d8e713cb01d82/raw/e114987d4a76c183208c763de4dbfecbf41b7f35/config_distro_storage_comparer_issue.patch"
             },

From 8a41325e51f4049dd2ec82d8f1d661ca44b6d274 Mon Sep 17 00:00:00 2001
From: Dana Hertzberg <59745109+danahertzberg@users.noreply.github.com>
Date: Wed, 4 Dec 2024 12:57:34 -0500
Subject: [PATCH 31/41] Closes #3917: Update no results views on events (#3918)

---
 .../custom/az_event/config/install/views.view.az_events.yml   | 4 ++--
 .../az_finder/config/quickstart/views.view.az_events.yml      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/custom/az_event/config/install/views.view.az_events.yml b/modules/custom/az_event/config/install/views.view.az_events.yml
index 5e24e12d47..14f08758aa 100644
--- a/modules/custom/az_event/config/install/views.view.az_events.yml
+++ b/modules/custom/az_event/config/install/views.view.az_events.yml
@@ -137,7 +137,7 @@ display:
           plugin_id: text
           empty: true
           content:
-            value: '<em>There are no upcoming events listed.</em>'
+            value: '<p><em>There are no upcoming events listed.</em></p>'
             format: az_standard
           tokenize: false
       sorts:
@@ -481,7 +481,7 @@ display:
           plugin_id: text
           empty: true
           content:
-            value: '<em>There are no past events listed.</em>'
+            value: '<p><em>There are no past events listed.</em></p>'
             format: az_standard
           tokenize: false
       sorts:
diff --git a/modules/custom/az_finder/config/quickstart/views.view.az_events.yml b/modules/custom/az_finder/config/quickstart/views.view.az_events.yml
index b5190afb9e..8476443a9a 100644
--- a/modules/custom/az_finder/config/quickstart/views.view.az_events.yml
+++ b/modules/custom/az_finder/config/quickstart/views.view.az_events.yml
@@ -138,7 +138,7 @@ display:
           plugin_id: text
           empty: true
           content:
-            value: '<em>There are no upcoming events listed.</em>'
+            value: '<p><em>There are no upcoming events listed.</em></p>'
             format: az_standard
           tokenize: false
       sorts:
@@ -974,7 +974,7 @@ display:
           plugin_id: text
           empty: true
           content:
-            value: '<em>There are no past events listed.</em>'
+            value: '<p><em>There are no past events listed.</em></p>'
             format: az_standard
           tokenize: false
       sorts:

From ab7b9ffa701536c70e1610c51ab83281cafaf59a Mon Sep 17 00:00:00 2001
From: David Celaya-Gonzalez <2702851+djcelaya@users.noreply.github.com>
Date: Fri, 6 Dec 2024 10:16:33 -0700
Subject: [PATCH 32/41] Closes #3653: Add Recent News Marquee demo content
 (#3921)

---
 modules/custom/az_demo/data/az_demo_image_file.json     | 4 +++-
 modules/custom/az_demo/data/az_demo_page_node.json      | 2 +-
 modules/custom/az_demo/data/az_demo_view_paragraph.json | 8 ++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/custom/az_demo/data/az_demo_image_file.json b/modules/custom/az_demo/data/az_demo_image_file.json
index 25a9399e0a..7f873917ec 100644
--- a/modules/custom/az_demo/data/az_demo_image_file.json
+++ b/modules/custom/az_demo/data/az_demo_image_file.json
@@ -107,7 +107,9 @@
     {
       "filename" : "mans_best_friend.jpeg",
       "alt" : "Cute dog",
-      "title": ""
+      "title": "",
+      "caption": "Research shows that dog owners often experience lower levels of stress, anxiety, and depression compared to those without pets.",
+      "credit": "Photo by Wilma Wildcat"
     },
     {
       "filename" : "connection-647206_1920.jpeg",
diff --git a/modules/custom/az_demo/data/az_demo_page_node.json b/modules/custom/az_demo/data/az_demo_page_node.json
index ec9f3099c0..d3ad0d76a6 100644
--- a/modules/custom/az_demo/data/az_demo_page_node.json
+++ b/modules/custom/az_demo/data/az_demo_page_node.json
@@ -187,7 +187,7 @@
       "path" : "/pages/news-view-paragraphs",
       "exclude_title" : true,
       "az_page_category" : "Views",
-      "az_main_content" : "100|101|102",
+      "az_main_content" : "100|101|102|191",
       "az_media_image" : "",
       "az_summary" : "A flexible page with news views."
     },
diff --git a/modules/custom/az_demo/data/az_demo_view_paragraph.json b/modules/custom/az_demo/data/az_demo_view_paragraph.json
index b6300f9cb4..2f25b6e30a 100644
--- a/modules/custom/az_demo/data/az_demo_view_paragraph.json
+++ b/modules/custom/az_demo/data/az_demo_view_paragraph.json
@@ -72,6 +72,14 @@
       "data" : "",
       "bottom_spacing" : "mb-4"
     },
+    {
+      "id" : 191,
+      "title" : "Recent News Marquee",
+      "target_id" : "az_news",
+      "display_id" : "marquee",
+      "data" : "",
+      "bottom_spacing" : "mb-0"
+    },
     {
       "id" : 111,
       "title" : "Grid - Modal",

From 072ffc06e1c4c45399cb664aab46a82be7f12194 Mon Sep 17 00:00:00 2001
From: Bao Nguyen <88011047+BaoNguyen09@users.noreply.github.com>
Date: Fri, 6 Dec 2024 10:48:00 -0700
Subject: [PATCH 33/41] Closes #3855: Update config schema files that have uuid
 fields that are string to use the uuid type (#3919)

---
 .../az_event_trellis/config/schema/az_event_trellis.schema.yml  | 2 +-
 .../az_publication/config/schema/az_citation_style.schema.yml   | 2 +-
 .../az_publication/config/schema/az_publication_type.schema.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/custom/az_event/az_event_trellis/config/schema/az_event_trellis.schema.yml b/modules/custom/az_event/az_event_trellis/config/schema/az_event_trellis.schema.yml
index cb121d6205..fef372034a 100644
--- a/modules/custom/az_event/az_event_trellis/config/schema/az_event_trellis.schema.yml
+++ b/modules/custom/az_event/az_event_trellis/config/schema/az_event_trellis.schema.yml
@@ -22,7 +22,7 @@ az_event_trellis.az_recurring_import_rule.*:
       type: label
       label: Label
     uuid:
-      type: string
+      type: uuid
     host:
       type: string
     owner:
diff --git a/modules/custom/az_publication/config/schema/az_citation_style.schema.yml b/modules/custom/az_publication/config/schema/az_citation_style.schema.yml
index d2138629de..3ec071fcfb 100644
--- a/modules/custom/az_publication/config/schema/az_citation_style.schema.yml
+++ b/modules/custom/az_publication/config/schema/az_citation_style.schema.yml
@@ -15,5 +15,5 @@ az_publication.az_citation_style.*:
       type: boolean
       label: 'Custom'
     uuid:
-      type: string
+      type: uuid
       label: 'Universally Unique Identifier'
diff --git a/modules/custom/az_publication/config/schema/az_publication_type.schema.yml b/modules/custom/az_publication/config/schema/az_publication_type.schema.yml
index f7eb3f8efc..a47d37f9f1 100644
--- a/modules/custom/az_publication/config/schema/az_publication_type.schema.yml
+++ b/modules/custom/az_publication/config/schema/az_publication_type.schema.yml
@@ -12,5 +12,5 @@ az_publication.type.*:
       type: string
       label: 'Mapped type'
     uuid:
-      type: string
+      type: uuid
       label: 'Universally Unique Identifier'

From 33eb5f91efd49a89b73d0475734b0b5e601bb216 Mon Sep 17 00:00:00 2001
From: Bao Nguyen <88011047+BaoNguyen09@users.noreply.github.com>
Date: Fri, 6 Dec 2024 10:51:24 -0700
Subject: [PATCH 34/41] Closes #3277: Update "Update Review Site" workflow to
 add a more descriptive commit message when rebuilding
 demo.quickstart.arizona.edu (#3928)

Co-authored-by: Chris Green <chrisgreen@arizona.edu>
---
 .github/workflows/review-site.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/review-site.yml b/.github/workflows/review-site.yml
index b4daae65a3..0d5fdc09c8 100644
--- a/.github/workflows/review-site.yml
+++ b/.github/workflows/review-site.yml
@@ -60,7 +60,7 @@ jobs:
           UPSTREAM_VERSION=$(jq -r '.require."az-digital/az_quickstart"' upstream/composer.json)
           COMPOSER_MEMORY_LIMIT=-1 composer -n require "az-digital/az_quickstart:dev-main as ${UPSTREAM_VERSION}"
           git add composer.json composer.lock
-          git commit --allow-empty -m 'rebuild kitten'
+          git commit --allow-empty -m '${{ github.event.head_commit.message }}'
           git push
 
   install-azqs:

From 0b10ea4cc4e1792a056c9a50587264657e8e2ab0 Mon Sep 17 00:00:00 2001
From: Bao Nguyen <88011047+BaoNguyen09@users.noreply.github.com>
Date: Fri, 6 Dec 2024 12:15:11 -0700
Subject: [PATCH 35/41] Closes #3130: Add descriptions for 6 AZ modules (#3910)

Co-authored-by: Cameron Green <camikazegreen@gmail.com>
Co-authored-by: Chris Green <chrisgreen@arizona.edu>
Co-authored-by: Brian Berndt <74572157+bberndt-uaz@users.noreply.github.com>
Co-authored-by: Joe Parsons <471936+joeparsons@users.noreply.github.com>
---
 .../az_block_types_quick_links.info.yml                          | 1 +
 modules/custom/az_flexible_block/az_flexible_block.info.yml      | 1 +
 modules/custom/az_flexible_page/az_flexible_page.info.yml        | 1 +
 modules/custom/az_google_tag/az_google_tag.info.yml              | 1 +
 modules/custom/az_select_menu/az_select_menu.info.yml            | 1 +
 modules/custom/az_seo/az_seo.info.yml                            | 1 +
 6 files changed, 6 insertions(+)

diff --git a/modules/custom/az_block_types/az_block_types_quick_links/az_block_types_quick_links.info.yml b/modules/custom/az_block_types/az_block_types_quick_links/az_block_types_quick_links.info.yml
index e813463f78..d73b973613 100644
--- a/modules/custom/az_block_types/az_block_types_quick_links/az_block_types_quick_links.info.yml
+++ b/modules/custom/az_block_types/az_block_types_quick_links/az_block_types_quick_links.info.yml
@@ -1,4 +1,5 @@
 name: 'Quickstart Block Types - Quick Links'
+description: "An embeddable content block with block fields that accept links."
 type: module
 core_version_requirement: ^9 || ^10
 package: The University of Arizona
diff --git a/modules/custom/az_flexible_block/az_flexible_block.info.yml b/modules/custom/az_flexible_block/az_flexible_block.info.yml
index 17f97db6a5..e95f098047 100644
--- a/modules/custom/az_flexible_block/az_flexible_block.info.yml
+++ b/modules/custom/az_flexible_block/az_flexible_block.info.yml
@@ -1,4 +1,5 @@
 name: 'Quickstart Flexible Block'
+description: "An embeddable content block with dynamic block elements."
 type: module
 core_version_requirement: ^9 || ^10
 package: The University of Arizona
diff --git a/modules/custom/az_flexible_page/az_flexible_page.info.yml b/modules/custom/az_flexible_page/az_flexible_page.info.yml
index bb1cf72770..b5a0770ffe 100644
--- a/modules/custom/az_flexible_page/az_flexible_page.info.yml
+++ b/modules/custom/az_flexible_page/az_flexible_page.info.yml
@@ -1,4 +1,5 @@
 name: 'Quickstart Flexible Page'
+description: "Provides Page content type and related configuration."
 type: module
 core_version_requirement: ^9 || ^10
 package: The University of Arizona
diff --git a/modules/custom/az_google_tag/az_google_tag.info.yml b/modules/custom/az_google_tag/az_google_tag.info.yml
index 7e76eba1d2..d50c40f7c7 100644
--- a/modules/custom/az_google_tag/az_google_tag.info.yml
+++ b/modules/custom/az_google_tag/az_google_tag.info.yml
@@ -1,4 +1,5 @@
 name: 'Quickstart Google Tag Manager'
+description: "Provides configuration of the institution-wide Google Tag Manager container (AZ Comprehensive)."
 type: module
 core_version_requirement: ^9 || ^10
 package: The University of Arizona
diff --git a/modules/custom/az_select_menu/az_select_menu.info.yml b/modules/custom/az_select_menu/az_select_menu.info.yml
index c5079bb15c..a106a9eede 100644
--- a/modules/custom/az_select_menu/az_select_menu.info.yml
+++ b/modules/custom/az_select_menu/az_select_menu.info.yml
@@ -1,4 +1,5 @@
 name: 'Quickstart Select Menu Block'
+description: "Allows displaying a menu as a dropdown selection, also known as persona menu."
 type: module
 core_version_requirement: ^9 || ^10
 package: The University of Arizona
diff --git a/modules/custom/az_seo/az_seo.info.yml b/modules/custom/az_seo/az_seo.info.yml
index 824495a007..3bf6fa1883 100644
--- a/modules/custom/az_seo/az_seo.info.yml
+++ b/modules/custom/az_seo/az_seo.info.yml
@@ -1,4 +1,5 @@
 name: 'Quickstart SEO'
+description: "Provides configuration to implement metadata for search engine optimization and track website traffic."
 type: module
 core_version_requirement: ^9 || ^10
 package: The University of Arizona

From 59acd1c8a7ab2132d32564b5d560770553e686d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2024 12:15:54 -0700
Subject: [PATCH 36/41] Update drupal/extlink requirement from 2.0.2 to 2.0.4
 (#3912)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 1d2009ede4..93b41411ee 100644
--- a/composer.json
+++ b/composer.json
@@ -71,7 +71,7 @@
         "drupal/environment_indicator": "4.0.10",
         "drupal/exclude_node_title": "1.4.0",
         "drupal/externalauth": "2.0.6",
-        "drupal/extlink": "2.0.2",
+        "drupal/extlink": "2.0.4",
         "drupal/field_group": "3.6.0",
         "drupal/field_group_link": "3.2.0",
         "drupal/flag": "4.0.0-beta5",

From 3007b423b61eeae781fdc69f59f1fb79040b964e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2024 12:16:21 -0700
Subject: [PATCH 37/41] Update drupal/webform requirement from 6.2.7 to 6.2.8
 (#3915)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 93b41411ee..82077d28c0 100644
--- a/composer.json
+++ b/composer.json
@@ -118,7 +118,7 @@
         "drupal/views_bulk_operations": "4.3.2",
         "drupal/views_remote_data": "1.0.3",
         "drupal/viewsreference": "2.0.0-beta10",
-        "drupal/webform": "6.2.7",
+        "drupal/webform": "6.2.8",
         "drupal/workbench_access": "2.0.3",
         "drupal/xmlsitemap": "1.5.0",
         "jjj/chosen": "2.2.1",

From 2e5b8da161267121df9bd23dc2a7f7a71d01c695 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2024 12:16:52 -0700
Subject: [PATCH 38/41] Update citation-style-language/styles requirement from
 0.0.564 to 0.0.569 (#3920)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 82077d28c0..9d38d7f339 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "az-digital/arizona-bootstrap": "2.0.27",
         "az-digital/az-icons": "1.0.2",
         "citation-style-language/locales": "0.0.23",
-        "citation-style-language/styles": "0.0.564",
+        "citation-style-language/styles": "0.0.569",
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.7",
         "drupal/access_unpublished": "1.6.0",

From 1611b837d0263509f379ff8e2f856070ba5727cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2024 12:18:34 -0700
Subject: [PATCH 39/41] Update drupal/migrate_plus requirement from 6.0.4 to
 6.0.5 (#3899)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9d38d7f339..1669c59793 100644
--- a/composer.json
+++ b/composer.json
@@ -95,7 +95,7 @@
         "drupal/menu_block": "1.13.0",
         "drupal/menu_link_attributes": "1.5.0",
         "drupal/metatag": "2.0.2",
-        "drupal/migrate_plus": "6.0.4",
+        "drupal/migrate_plus": "6.0.5",
         "drupal/migrate_queue_importer": "2.1.1",
         "drupal/migrate_tools": "6.0.4",
         "drupal/optional_end_date": "1.4.0",

From 23ef7523678c29e6a1137744dad194e5899036d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2024 12:20:24 -0700
Subject: [PATCH 40/41] Update drupal/google_tag requirement from 2.0.6 to
 2.0.7 (#3926)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 1669c59793..1a87de7fee 100644
--- a/composer.json
+++ b/composer.json
@@ -75,7 +75,7 @@
         "drupal/field_group": "3.6.0",
         "drupal/field_group_link": "3.2.0",
         "drupal/flag": "4.0.0-beta5",
-        "drupal/google_tag": "2.0.6",
+        "drupal/google_tag": "2.0.7",
         "drupal/honeypot": "2.1.4",
         "drupal/image_widget_crop": "2.4.0",
         "drupal/imagemagick": "4.0.2",

From 038b5823318b878c84f7b4962a635bd60f45f2b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2024 12:27:09 -0700
Subject: [PATCH 41/41] Update citation-style-language/locales requirement from
 0.0.23 to 0.0.25 (#3927)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 1a87de7fee..25074b23ad 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
         "php": ">=8.1",
         "az-digital/arizona-bootstrap": "2.0.27",
         "az-digital/az-icons": "1.0.2",
-        "citation-style-language/locales": "0.0.23",
+        "citation-style-language/locales": "0.0.25",
         "citation-style-language/styles": "0.0.569",
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.7",