PE-588 Update to Drupal 10.2.5 and update modules (#574)

* PE-588 Update to Drupal 10.2.5 * PE-588 Update Drupal modules * PE-588 Update Radix theme * PE-588 Fix "Home" breadcrumb * PE-588 More composer updates
eGovPDX · Apr 23, 2024 · f61118a · f61118a
1 parent 702e596
commit f61118a
Show file tree

Hide file tree

Showing 20 changed files with 681 additions and 696 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -42,6 +42,9 @@
 *.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.yml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 
+# PHPStan's baseline uses tabs instead of spaces.
+core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tabwidth=2 diff=php linguist-language=php
+
 # Define binary file attributes.
 # - Do not treat them as text.
 # - Include binary diff in patches instead of "binary files differ."

diff --git a/composer.json b/composer.json
@@ -41,14 +41,14 @@
  "drupal/field_permissions": "^1.1",
  "drupal/field_states_ui": "^3.0",
  "drupal/flexible_permissions": "^1.1",
- "drupal/google_tag": "^1.4",
+ "drupal/google_tag": "^2.0",
  "drupal/group": "^2.2",
  "drupal/group_notifications": "^1.0@beta",
  "drupal/groupmedia": "^3.0",
  "drupal/image_effects": "^3.2",
  "drupal/image_widget_crop": "^2.4",
  "drupal/imagemagick": "^3.3",
- "drupal/inline_entity_form": "^1.0@RC",
+ "drupal/inline_entity_form": "^3.0@RC",
  "drupal/key": "^1.8",
  "drupal/layout_builder_restrictions": "^2.5",
  "drupal/layout_builder_st": "^1.0@alpha",
@@ -77,7 +77,7 @@
  "drupal/quick_node_clone": "^1.14",
  "drupal/r4032login": "^2.2",
  "drupal/rabbit_hole": "^1.0@beta",
- "drupal/radix": "5.0.7",
+ "drupal/radix": "^5.0",
  "drupal/realname": "^2.0",
  "drupal/redirect": "^1.5",
  "drupal/redirect_404": "^1.4",
@@ -205,7 +205,6 @@
  "PE-479 - Update media library so that documents are the default first media type": "patches/pe-479-media-library-default-documents.patch",
  "2851086 - Tour tip displays under toolbar": "https://www.drupal.org/files/issues/2022-03-17/2851086-42.patch",
  "3410100 - [10.2 regression] CKEditor 5 breaks when Source editing button is added and \"Manually editable HTML tags\" are specified": "https://www.drupal.org/files/issues/2024-01-23/drupal-revert-source-editing-validation-tightening-3410100-38.patch",
- "3394048 - [Drupal 10.2 regression] Media Library \"widget\" View media type tabs have lost styling": "https://www.drupal.org/files/issues/2024-02-14/3394048.patch",
  "3415961 - [drupalMedia] Using the Insert Media button causes the window to scroll to the bottom of the page": "https://www.drupal.org/files/issues/2024-02-15/3415961.patch",
  "PE-543 - Fix tour scrolling": "patches/pe-543-fix-tour-scrolling.patch"
  },

diff --git a/composer.lock b/composer.lock
diff --git a/web/sites/default/config/admin_dialogs.admin_dialog.add_field_links.yml b/web/sites/default/config/admin_dialogs.admin_dialog.add_field_links.yml
@@ -9,7 +9,7 @@ label: 'Add Field Links'
 type: actions
 dialog_group: administrative
 dialog_type: modal
-dialog_width: '750'
+dialog_width: '1200'
 selection_criteria:
  routes:
  - 'field_ui.field_storage_config_add:field_storage_config_add_*'
diff --git a/web/sites/default/config/admin_dialogs.settings.yml b/web/sites/default/config/admin_dialogs.settings.yml
@@ -1,6 +1,6 @@
 _core:
  default_config_hash: G-BkSZ4MwTQO_d05RNEIb4dhTu1aH2Oib29zz7Jhufw
-delete_ops: 1
-delete_buttons: 1
-other_buttons: 1
-submit_spinner: 0
+delete_ops: true
+delete_buttons: true
+other_buttons: true
+submit_spinner: false
diff --git a/web/sites/default/config/block.block.westy_breadcrumbs.yml b/web/sites/default/config/block.block.westy_breadcrumbs.yml
@@ -23,4 +23,4 @@ visibility:
  request_path:
  id: request_path
  negate: true
- pages: "/group/*\r\n!/group/*/*"
+ pages: "<front>\r\n/group/*\r\n!/group/*/*"
diff --git a/web/sites/default/config/core.entity_form_display.node.notification.default.yml b/web/sites/default/config/core.entity_form_display.node.notification.default.yml
@@ -62,7 +62,7 @@ content:
  third_party_settings: { }
  publish_state:
  type: scheduler_moderation
- weight: 11
+ weight: 53
  region: content
  settings: { }
  third_party_settings: { }
@@ -97,7 +97,7 @@ content:
  third_party_settings: { }
  unpublish_state:
  type: scheduler_moderation
- weight: 12
+ weight: 55
  region: content
  settings: { }
  third_party_settings: { }

diff --git a/web/sites/default/config/core.extension.yml b/web/sites/default/config/core.extension.yml
@@ -21,7 +21,6 @@ module:
  ckeditor5_fullscreen: 0
  components: 0
  config: 0
- config_filter: 0
  config_split: 0
  contact: 0
  content_moderation: 0
@@ -153,7 +152,6 @@ module:
  toolbar: 0
  toolbar_menu: 0
  tour: 0
- transliterate_filenames: 0
  twig_tools: 0
  twig_tweak: 0
  update: 0

diff --git a/web/sites/default/config/diff.settings.yml b/web/sites/default/config/diff.settings.yml
@@ -15,4 +15,5 @@ general_settings:
  unified_fields:
  enabled: true
  weight: 2
+ visual_default_view_mode: full
  visual_inline_theme: default
diff --git a/web/sites/default/config/easy_breadcrumb.settings.yml b/web/sites/default/config/easy_breadcrumb.settings.yml
@@ -6,12 +6,12 @@ excluded_paths: ''
 replaced_titles: "{{ Drupal_field('label', 'group', Raw_arguments.field_display_in_group, {label: 'hidden'}) }} Events::Events\r\n{{ Drupal_field('label', 'group', Raw_arguments.field_display_in_group, {label: 'hidden'}) }} Past Events::Past Events\r\n{{ Drupal_field('label', 'group', Raw_arguments.field_display_in_group, {label: 'hidden'}) }} Contracts::Contracts\r\n{{ Drupal_field('label', 'group', Raw_arguments.field_display_in_group, {label: 'hidden'}) }} News::News"
 custom_paths: ''
 include_home_segment: true
-alternative_title_field: field_breadcrumb_title
+alternative_title_field: ''
 home_segment_title: Home
 home_segment_keep: false
 include_title_segment: false
 title_from_page_when_available: true
-title_segment_as_link: false
+title_segment_as_link: true
 use_menu_title_as_fallback: false
 use_page_title_as_menu_title_fallback: false
 menu_title_preferred_menu: ''
@@ -41,5 +41,5 @@ segment_display_limit: null
 truncator_mode: false
 truncator_length: 100
 truncator_dots: true
-remove_repeated_segments_text_only: 0
-home_segment_validation_skip: 0
+remove_repeated_segments_text_only: false
+home_segment_validation_skip: false
diff --git a/web/sites/default/config/file.settings.yml b/web/sites/default/config/file.settings.yml
@@ -7,9 +7,9 @@ icon:
  directory: core/modules/file/icons
 make_unused_managed_files_temporary: false
 filename_sanitization:
- transliterate: false
- replace_whitespace: false
- replace_non_alphanumeric: false
- deduplicate_separators: false
- lowercase: false
+ transliterate: true
+ replace_whitespace: true
+ replace_non_alphanumeric: true
+ deduplicate_separators: true
+ lowercase: true
  replacement_character: '-'
diff --git a/web/sites/default/config/google_tag.container.employees_portland.gov.yml b/web/sites/default/config/google_tag.container.employees_portland.gov.yml
@@ -3,60 +3,78 @@ langcode: en
 status: true
 dependencies:
  module:
- - webform
+ - system
 id: employees_portland.gov
 label: 'Employees Portland.gov'
 weight: 0
-container_id: GTM-558BXL5
-data_layer: dataLayer
-include_classes: false
-whitelist_classes: |-
- google
- nonGooglePixels
- nonGoogleScripts
- nonGoogleIframes
-blacklist_classes: |-
- customScripts
- customPixels
-include_environment: true
-environment_id: env-3
-environment_token: 7m8jEDA_wx-D-szWRcWBhQ
-path_toggle: 'exclude listed'
-path_list: |-
- /admin*
- /batch*
- /clone/*
- /devel/*
- /node/add*
- /node/*/edit
- /node/*/delete
- /node/*/revisions
- /node/*/usage
- /user/*/edit*
- /user/*/cancel*
- /user/*/scheduled*
- /user/*/connected-accounts
- /user/*/submissions
- /group/*/edit
- /group/*/delete
- /group/*/content*
- /group/*/nodes
- /group/*/revisions
- /group/*/members
- /group/*/media*
- /group/*/usage
- /group/*/subgroups
- /group/*/create
- /media/*/edit
- /media/*/delete
- /media/*/usage
- /taxonomy/*/edit
- /taxonomy/*/delete
- /taxonomy/*/usage
-role_toggle: 'exclude listed'
-role_list: { }
-status_toggle: 'exclude listed'
-status_list: |-
- 403
- 404
-conditions: { }
+tag_container_ids:
+ - GTM-558BXL5
+advanced_settings:
+ gtm:
+ GTM-558BXL5:
+ data_layer: dataLayer
+ include_classes: false
+ allowlist_classes: |-
+ google
+ nonGooglePixels
+ nonGoogleScripts
+ nonGoogleIframes
+ blocklist_classes: |-
+ customScripts
+ customPixels
+ include_environment: true
+ environment_id: env-3
+ environment_token: 7m8jEDA_wx-D-szWRcWBhQ
+dimensions_metrics: { }
+conditions:
+ request_path:
+ id: request_path
+ negate: true
+ pages: |-
+ /admin*
+ /batch*
+ /clone/*
+ /devel/*
+ /node/add*
+ /node/*/edit
+ /node/*/delete
+ /node/*/revisions
+ /node/*/usage
+ /user/*/edit*
+ /user/*/cancel*
+ /user/*/scheduled*
+ /user/*/connected-accounts
+ /user/*/submissions
+ /group/*/edit
+ /group/*/delete
+ /group/*/content*
+ /group/*/nodes
+ /group/*/revisions
+ /group/*/members
+ /group/*/media*
+ /group/*/usage
+ /group/*/subgroups
+ /group/*/create
+ /media/*/edit
+ /media/*/delete
+ /media/*/usage
+ /taxonomy/*/edit
+ /taxonomy/*/delete
+ /taxonomy/*/usage
+ response_code:
+ id: response_code
+ negate: true
+ response_codes: |-
+ 403
+ 404
+events:
+ search: { }
+ webform_purchase: { }
+ login:
+ method: CMS
+ custom: { }
+ generate_lead:
+ value: ''
+ currency: ''
+ sign_up:
+ method: CMS
diff --git a/web/sites/default/config/google_tag.settings.yml b/web/sites/default/config/google_tag.settings.yml
@@ -1,38 +1,2 @@
-_core:
- default_config_hash: 65d5DfK5p2hQDpBskbvCIj2hSEqw_Odm2e_d46BH1Lk
-uri: 'public:/'
-compact_snippet: true
-include_file: true
-rebuild_snippets: true
-flush_snippets: false
-debug_output: false
-_default_container:
- container_id: ''
- data_layer: dataLayer
- include_classes: false
- whitelist_classes: |-
- google
- nonGooglePixels
- nonGoogleScripts
- nonGoogleIframes
- blacklist_classes: |-
- customScripts
- customPixels
- include_environment: false
- environment_id: ''
- environment_token: ''
- path_toggle: 'exclude listed'
- path_list: |-
- /admin*
- /batch*
- /node/add*
- /node/*/edit
- /node/*/delete
- /user/*/edit*
- /user/*/cancel*
- role_toggle: 'exclude listed'
- role_list: { }
- status_toggle: 'exclude listed'
- status_list: |-
- 403
- 404
+use_collection: false
+default_google_tag_entity: employees_portland.gov
diff --git a/web/sites/default/config/imagemagick.settings.yml b/web/sites/default/config/imagemagick.settings.yml
@@ -6,7 +6,6 @@ path_to_binaries: ''
 prepend: ''
 log_warnings: true
 debug: false
-locale: en_US.UTF-8
 image_formats:
  PNG:
  mime_type: image/png

diff --git a/web/sites/default/config/node.type.notification.yml b/web/sites/default/config/node.type.notification.yml
@@ -44,7 +44,7 @@ third_party_settings:
  sticky_stop_padding: '0'
 name: Notification
 type: notification
-description: 'Notifications help inform the community of important information that a bureau or office wants to highlight for a limited period of time. They are dismissable by a community member.'
+description: 'Notifications help inform employees of important information that a bureau or office wants to highlight for a limited period of time. They are dismissable by employees.'
 help: ''
 new_revision: true
 preview_mode: 1

diff --git a/web/sites/default/config/scheduler.settings.yml b/web/sites/default/config/scheduler.settings.yml
@@ -18,7 +18,6 @@ default_unpublish_enable: false
 default_unpublish_required: false
 default_unpublish_revision: false
 hide_seconds: false
-lightweight_cron_access_key: 8c1ad148a4df76cdcdbc
 log: true
 time_letters: hHgGisaA
 time_only_format: 'H:i:s'
diff --git a/web/sites/default/config/views.view.group_search_index.yml b/web/sites/default/config/views.view.group_search_index.yml
@@ -1836,7 +1836,7 @@ display:
  multi_type: separator
  multi_separator: ', '
  cache:
- type: none
+ type: search_api_none
  options: { }
  empty:
  area:

diff --git a/web/sites/default/config/views.view.search_index.yml b/web/sites/default/config/views.view.search_index.yml
@@ -67,7 +67,7 @@ display:
  'entity:user':
  user: contact_details
  cache:
- type: none
+ type: search_api_none
  options: { }
  empty:
  area_text_custom:

diff --git a/web/themes/custom/westy/src/scss/base/_typography.scss b/web/themes/custom/westy/src/scss/base/_typography.scss
@@ -36,7 +36,7 @@ h1, h1.page-title {
  }
 }
 
-h2 {
+h2, h2 strong {
  font-size: $h2-font-size;
  font-weight: 600;
 }

diff --git a/web/themes/custom/westy/src/scss/westy.style.scss b/web/themes/custom/westy/src/scss/westy.style.scss
@@ -10,8 +10,7 @@
 
 // Component
 // -----------------------------------------------------------------------------
-@import "../../contrib/radix/src/components/navbar/navbar";
-@import "../../contrib/radix/src/components/forum/forum";
+@import "../components/navbar/navbar";
 @import "../components/caption/caption";
 @import "../components/form/form";
 @import "../components/item-list/item-list";