Skip to content

Commit

Permalink
Merge branch '11.x' of https://github.com/SU-SWS/stanford_profile int…
Browse files Browse the repository at this point in the history
…o 5.x
  • Loading branch information
pookmish committed May 29, 2024
2 parents a8048d8 + 078e0f1 commit 1587620
Show file tree
Hide file tree
Showing 13 changed files with 109 additions and 29 deletions.
9 changes: 3 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"drupal/core": "~10.2.0",
"drupal/cshs": "^4.0",
"drupal/default_content": "^2.0@alpha",
"drupal/diff": "1.1.0",
"drupal/diff": "^1.3",
"drupal/display_field_copy": "^2.0.",
"drupal/domain_301_redirect": "^2.0",
"drupal/ds": "^3.3",
Expand Down Expand Up @@ -97,7 +97,7 @@
"drupal/jsonapi_views": "^1.1",
"drupal/key": "^1.15",
"drupal/layout_builder_modal": "^1.0",
"drupal/layout_builder_restrictions": "^2.2",
"drupal/layout_builder_restrictions": "^3.0",
"drupal/layout_library": "^1.0-beta1",
"drupal/layout_paragraphs": "^2.0",
"drupal/link_attributes": "^2.0",
Expand Down Expand Up @@ -127,7 +127,7 @@
"drupal/rabbit_hole": "^1.0@beta",
"drupal/real_aes": "^2.4",
"drupal/redirect": "^1.0-beta1",
"drupal/responsive_tables_filter": "^1.9",
"drupal/responsive_tables_filter": "^2.0",
"drupal/role_delegation": "^1.0@beta",
"drupal/scheduler": "^2.0",
"drupal/search_api": "^1.19",
Expand Down Expand Up @@ -192,9 +192,6 @@
"drupal/hook_event_dispatcher": {
"https://www.drupal.org/project/hook_event_dispatcher/issues/3354751": "https://www.drupal.org/files/issues/2024-03-14/hook_event_dispatcher-4.x-3354751-7.patch"
},
"drupal/menu_block": {
"https://www.drupal.org/project/menu_block/issues/3271218": "https://www.drupal.org/files/issues/2022-04-29/menu_block_rendered_empty-3271218-17.patch"
},
"drupal/menu_link": {
"https://www.drupal.org/project/menu_link/issues/3358081": "https://git.drupalcode.org/project/menu_link/-/merge_requests/9.patch"
},
Expand Down
3 changes: 2 additions & 1 deletion config/sync/autologout.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ role_logout: false
role_logout_max: false
redirect_url: /user/login
no_dialog: false
message: 'Your session is about to expire. Do you want to reset it?'
message: 'We are about to log you out for inactivity. If we do, you will lose any unsaved work. Do you need more time?'
inactivity_message: 'You have been logged out due to inactivity.'
inactivity_message_type: status
modal_width: 450
Expand All @@ -20,3 +20,4 @@ jstimer_js_load_option: false
use_alt_logout_method: false
use_watchdog: true
whitelisted_ip_addresses: ''
include_destination: true
1 change: 1 addition & 0 deletions config/sync/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ module:
inline_form_errors: 0
jquery_ui: 0
jquery_ui_draggable: 0
js_cookie: 0
jsonapi: 0
jsonapi_defaults: 0
jsonapi_extras: 0
Expand Down
1 change: 1 addition & 0 deletions config/sync/diff.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ general_settings:
unified_fields:
enabled: true
weight: 2
visual_default_view_mode: full
visual_inline_theme: default
3 changes: 0 additions & 3 deletions config/sync/editoria11y.configuration.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ batching: true
disable_introspection: false
query_depth: null
query_complexity: null
schema_configuration: { }
schema_configuration:
graphql_compose:
enabled: true
persisted_queries_settings:
automatic_persisted_query:
weight: 0
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
uuid: a4f0325f-d80d-46cd-a8c2-ddde8bab17b2
langcode: en
status: true
dependencies:
module:
- jumpstart_ui
dependencies: { }
id: stanford_page_title_banner
label: 'Page Title Banner'
icon_uuid: null
icon_default: null
description: 'Page Title Banner Paragraph Type'
behavior_plugins:
hero_pattern:
enabled: true
overlay_position: left
heading: h2
hide_heading: false
behavior_plugins: { }
40 changes: 34 additions & 6 deletions config/sync/search_api.index.algolia_search.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,25 @@ langcode: en
status: false
dependencies:
config:
- field.storage.node.su_event_audience
- field.storage.node.su_basic_page_type
- field.storage.node.su_course_subject
- field.storage.node.su_event_audience
- field.storage.node.su_event_date_time
- field.storage.node.su_event_subject
- field.storage.node.su_event_type
- field.storage.node.su_person_full_title
- field.storage.node.su_news_topics
- field.storage.node.su_person_full_title
- field.storage.node.su_person_short_title
- field.storage.node.su_person_type_group
- field.storage.node.su_publication_topics
- field.storage.node.su_shared_tags
- field.storage.node.su_person_short_title
- field.storage.node.su_event_subject
- search_api.server.algolia_search
- core.entity_view_mode.node.search_indexing
module:
- taxonomy
- node
- search_api
- stanford_profile_helper
id: algolia_search
name: 'Algolia Search'
description: ''
Expand Down Expand Up @@ -267,8 +268,8 @@ processor_settings:
entity_type: { }
html_filter:
weights:
preprocess_index: -15
preprocess_query: -15
preprocess_index: -49
preprocess_query: -6
all_fields: true
fields:
- basic_page_type
Expand Down Expand Up @@ -298,6 +299,33 @@ processor_settings:
tags: { }
language_with_fallback: { }
rendered_item: { }
space_tags:
weights:
preprocess_index: -50
all_fields: 1
fields:
- basic_page_type
- byline
- course_subject
- dek
- email
- event_audience
- event_subject
- event_type
- html
- news_type
- person_full_title
- person_short_title
- person_type
- phone
- photo
- publication_type
- shared_tags
- subheadline
- summary
- title
- type
- url
tracker_settings:
default:
indexing_order: fifo
Expand Down
58 changes: 57 additions & 1 deletion config/sync/views.view.stanford_basic_pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ display:
- 'config:field.storage.paragraph.su_banner_image'
viewfield_block_1:
id: viewfield_block_1
display_title: 'Card Grid'
display_title: 'Card Grid, Creation Date Sort (desc)'
display_plugin: viewfield_block
position: 2
display_options:
Expand Down Expand Up @@ -883,3 +883,59 @@ display:
- 'config:field.storage.node.su_page_description'
- 'config:field.storage.node.su_page_image'
- 'config:field.storage.paragraph.su_banner_image'
viewfield_block_2:
id: viewfield_block_2
display_title: 'Card Grid, Alphabetical Title Sort (asc)'
display_plugin: viewfield_block
position: 2
display_options:
display_extenders: { }
display_description: ''
style:
type: html_list
options:
row_class: ''
default_row_class: 1
uses_fields: 0
type: ul
wrapper_class: ''
class: 'su-list-unstyled grid-container-3'
defaults:
style: false
row: false
arguments: true
sorts: false
row:
type: 'entity:node'
options:
relationship: none
view_mode: stanford_h3_card
block_category: 'Basic Page Type Lists (Views)'
sorts:
title:
id: title
table: node_field_data
field: title
relationship: none
group_type: group
admin_label: ''
order: ASC
exposed: false
expose:
label: ''
field_identifier: ''
entity_type: node
entity_field: title
plugin_id: standard
cache_metadata:
max-age: -1
contexts:
- 'languages:language_content'
- 'languages:language_interface'
- url
- 'user.node_grants:view'
- user.permissions
tags:
- 'config:field.storage.node.su_page_description'
- 'config:field.storage.node.su_page_image'
- 'config:field.storage.paragraph.su_banner_image'
2 changes: 2 additions & 0 deletions tests/codeception/acceptance/Content/BasicPageCest.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ public function testH1Tags(AcceptanceTester $I) {
* The revision history tab should be functional.
*
* Regression test for D8CORE-1547.
*
* @group D8CORE-1547
*/
public function testRevisionPage(AcceptanceTester $I) {
$title = $this->faker->words(3, TRUE);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

/**
* Test the node revision delete module functionality.
*
* @group node_revision_delete
*/
class NodeRevisionDeleteCest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ public function testCardParagraph(FunctionalTester $I) {

/**
* The user should be able to see all revisions of a node.
*
* @group revisions
*/
public function testViewRevisions(FunctionalTester $I) {
$paragraph = $I->createEntity([
Expand Down
2 changes: 0 additions & 2 deletions tests/codeception/functional/Paragraphs/CardCest.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ public function __construct() {

/**
* The banner paragraph should display its fields.
*
* @group foobar
*/
public function testCardBehaviors(FunctionalTester $I) {
$field_values = [
Expand Down

0 comments on commit 1587620

Please sign in to comment.