Merge branch 'main' into 3741-add-contextual-links-for-embedded-media…

…-content-ie-image
az-digital · Dec 11, 2024 · 6ad006c · 6ad006c
2 parents eb3ed21 + 038b582
commit 6ad006c
Show file tree

Hide file tree

Showing 132 changed files with 2,729 additions and 651 deletions.
diff --git 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 }}"}'
diff --git 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:

diff --git 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="[email protected]"
       - $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="[email protected]"
       - $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="[email protected]"
       - $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="[email protected]"
       - $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
@@ -32,26 +32,25 @@
         "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/styles": "0.0.561",
+        "citation-style-language/locales": "0.0.25",
+        "citation-style-language/styles": "0.0.569",
         "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",
         "drupal/auto_entitylabel": "3.3.0",
         "drupal/better_exposed_filters": "7.0.2",
-        "drupal/blazy": "3.0.12",
-        "drupal/block_class": "2.0.11",
+        "drupal/blazy": "3.0.13",
+        "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",
         "drupal/cas": "2.3.2",
         "drupal/chosen": "4.0.3",
         "drupal/ckeditor_bs_grid": "2.0.12",
-        "drupal/ckeditor_indentblock": "1.0",
-        "drupal/coffee": "1.4.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",
         "drupal/config_ignore_readonly": "2.2.0",
@@ -61,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",
@@ -72,18 +71,18 @@
         "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.1.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",
         "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.0",
+        "drupal/jquery_ui_datepicker": "2.1.1",
         "drupal/jquery_ui_slider": "*",
         "drupal/jquery_ui_touch_punch": "*",
         "drupal/link_class": "2.1.0",
@@ -96,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",
@@ -106,19 +105,20 @@
         "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",
         "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",
         "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",
+        "drupal/webform": "6.2.8",
         "drupal/workbench_access": "2.0.3",
         "drupal/xmlsitemap": "1.5.0",
         "jjj/chosen": "2.2.1",
@@ -127,7 +127,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"
@@ -154,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"
             },
@@ -177,7 +172,8 @@
                 "[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",
-                "Provide option to display contextual links on embedded entities (3174252)": "web/profiles/custom/az_quickstart/patches/composer/drupal/core/3174252-Provide-option-to-display-contextual-links-on-embedded-entities.diff"
+                "Provide option to display contextual links on embedded entities (3174252)": "web/profiles/custom/az_quickstart/patches/composer/drupal/core/3174252-Provide-option-to-display-contextual-links-on-embedded-entities.diff",
+                "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",
@@ -216,6 +212,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": {

diff --git 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/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_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_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));
         }

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
@@ -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_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_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/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."
     },