From 61fbbdf5651b52d0c61dac3f0bb4c268d977d711 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Wed, 16 Oct 2024 15:46:06 +0000 Subject: [PATCH 1/8] 11.4.1 --- .../humsci/su_humsci_profile/su_humsci_profile.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml index bdd937ee2..3ae9561c3 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml @@ -1,7 +1,7 @@ name: 'Stanford HumSci' type: profile description: 'Installation profile for HumSci Drupal' -version: 11.4.0 +version: 11.4.1 core_version_requirement: '^9.4 || ^10' themes: - material_admin From 054a851ff7929c34c3c8ea9b71717dbc3a8199fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20D=C3=ADaz=20Soto?= Date: Thu, 17 Oct 2024 14:18:41 -0600 Subject: [PATCH 2/8] SHS-5819: Remove the Row component from the platform (#1643) * SHS-5819: Remove the Row component from the platform. --- config/default/config_ignore.settings.yml | 1 - ..._form_display.paragraph.hs_row.default.yml | 64 ----- ..._view_display.paragraph.hs_row.default.yml | 29 --- config/default/core.extension.yml | 2 - ...hs_basic_page.field_hs_page_components.yml | 5 - ....node.hs_basic_page.field_hs_page_hero.yml | 3 - ...ate_page.field_hs_priv_page_components.yml | 3 - ...h.hs_carousel.field_hs_carousel_slides.yml | 3 - ...s_collection.field_hs_collection_items.yml | 5 - ...o_slider.field_hs_gradient_hero_slides.yml | 3 - ...v_collection.field_hs_collection_items.yml | 3 - ...ragraph.hs_row.field_hs_row_components.yml | 117 --------- ...paragraph.hs_row.field_paragraph_style.yml | 21 -- ...s_sptlght_slder.field_hs_sptlght_sldes.yml | 3 - ...aragraph.hs_timeline.field_hs_timeline.yml | 3 - ...rage.paragraph.field_hs_row_components.yml | 22 -- .../paragraphs.paragraphs_type.hs_row.yml | 12 - .../su_humsci_profile/drush.services.yml | 6 - .../src/Commands/HumsciCommands.php | 112 --------- .../su_humsci_profile.info.yml | 2 - .../su_humsci_profile.install | 72 +++++- .../docs/drupal-configuration-defaults.md | 2 +- .../humsci/humsci_basic/package-lock.json | 224 ++++++++++-------- .../themes/humsci/humsci_basic/package.json | 2 +- .../src/scss/components/_card.scss | 5 +- .../components/_pattern.timeline-item.scss | 1 - .../src/scss/components/_postcard.scss | 3 +- .../components/_vertical-linked-card.scss | 8 - .../src/scss/objects/_layouts.general.scss | 1 - .../src/scss/objects/_layouts.row.scss | 10 +- .../src/scss/utilities/_raised-cards.scss | 6 - docs/Codeception.md | 4 - .../Install/Content/FlexiblePageCest.php | 34 --- .../acceptance/Paragraphs/ParagraphsCest.php | 5 - 34 files changed, 204 insertions(+), 592 deletions(-) delete mode 100644 config/default/core.entity_form_display.paragraph.hs_row.default.yml delete mode 100644 config/default/core.entity_view_display.paragraph.hs_row.default.yml delete mode 100644 config/default/field.field.paragraph.hs_row.field_hs_row_components.yml delete mode 100644 config/default/field.field.paragraph.hs_row.field_paragraph_style.yml delete mode 100644 config/default/field.storage.paragraph.field_hs_row_components.yml delete mode 100644 config/default/paragraphs.paragraphs_type.hs_row.yml delete mode 100644 docroot/profiles/humsci/su_humsci_profile/drush.services.yml delete mode 100644 docroot/profiles/humsci/su_humsci_profile/src/Commands/HumsciCommands.php delete mode 100644 tests/codeception/acceptance/Install/Content/FlexiblePageCest.php diff --git a/config/default/config_ignore.settings.yml b/config/default/config_ignore.settings.yml index 9cf7aa8e7..57202edd5 100644 --- a/config/default/config_ignore.settings.yml +++ b/config/default/config_ignore.settings.yml @@ -21,7 +21,6 @@ ignored_config_entities: - 'domain_301_redirect.settings:domain' - 'domain_301_redirect.settings:enabled' - 'field.field.node.hs_basic_page.field_hs_page_components:settings.handler_settings' - - 'field.field.paragraph.hs_row.field_hs_row_components:settings.handler_settings' - 'field.field.node.hs_basic_page.field_hs_page_hero:settings.handler_settings' - 'field.field.node.hs_private_page.field_hs_priv_page_components:settings.handler_settings' - ~gin.settings diff --git a/config/default/core.entity_form_display.paragraph.hs_row.default.yml b/config/default/core.entity_form_display.paragraph.hs_row.default.yml deleted file mode 100644 index 83a651d9f..000000000 --- a/config/default/core.entity_form_display.paragraph.hs_row.default.yml +++ /dev/null @@ -1,64 +0,0 @@ -uuid: c273ceea-0bef-4bb8-be8e-a438ec7c5d87 -langcode: en -status: true -dependencies: - config: - - field.field.paragraph.hs_row.field_hs_row_components - - field.field.paragraph.hs_row.field_paragraph_style - - paragraphs.paragraphs_type.hs_row - module: - - paragraphs - - paragraphs_ee - - paragraphs_features -_core: - default_config_hash: xw8Nt5MeZQzdXjliLWuD9rtvSsRyJHxIxJUmGW06plM -id: paragraph.hs_row.default -targetEntityType: paragraph -bundle: hs_row -mode: default -content: - field_hs_row_components: - type: paragraphs - weight: 0 - region: content - settings: - title: 'Row Component' - title_plural: 'Row Components' - edit_mode: closed - closed_mode: preview - autocollapse: all - closed_mode_threshold: 0 - add_mode: dropdown - form_display_mode: default - default_paragraph_type: _none - features: - add_above: add_above - collapse_edit_all: collapse_edit_all - convert: '0' - duplicate: duplicate - third_party_settings: - paragraphs_features: - add_in_between: false - add_in_between_link_count: 3 - delete_confirmation: false - show_drag_and_drop: true - show_collapse_all: true - paragraphs_ee: - paragraphs_ee: - dialog_off_canvas: false - dialog_style: tiles - field_paragraph_style: - type: options_select - weight: 1 - region: content - settings: { } - third_party_settings: { } - layout_paragraphs_fields: - weight: -200 - region: content - settings: { } - third_party_settings: { } -hidden: - created: true - status: true - uid: true diff --git a/config/default/core.entity_view_display.paragraph.hs_row.default.yml b/config/default/core.entity_view_display.paragraph.hs_row.default.yml deleted file mode 100644 index 1117db233..000000000 --- a/config/default/core.entity_view_display.paragraph.hs_row.default.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: 4b98a281-b1e6-4755-823a-f92dfc70a093 -langcode: en -status: true -dependencies: - config: - - field.field.paragraph.hs_row.field_hs_row_components - - field.field.paragraph.hs_row.field_paragraph_style - - paragraphs.paragraphs_type.hs_row - module: - - entity_reference_revisions -_core: - default_config_hash: HJ_nmW_7Dm3vJJYfiiaQmOLw9M_f9Mk3WsmNjYiIRBY -id: paragraph.hs_row.default -targetEntityType: paragraph -bundle: hs_row -mode: default -content: - field_hs_row_components: - type: entity_reference_revisions_entity_view - label: hidden - settings: - view_mode: default - link: '' - third_party_settings: { } - weight: 0 - region: content -hidden: - field_paragraph_style: true - search_api_excerpt: true diff --git a/config/default/core.extension.yml b/config/default/core.extension.yml index beed18983..6f7f47205 100644 --- a/config/default/core.extension.yml +++ b/config/default/core.extension.yml @@ -120,8 +120,6 @@ module: hs_publications_display: 0 hs_research: 0 hs_research_display: 0 - hs_row: 0 - hs_row_display: 0 hs_table_filter: 0 hs_text_area: 0 hs_text_area_display: 0 diff --git a/config/default/field.field.node.hs_basic_page.field_hs_page_components.yml b/config/default/field.field.node.hs_basic_page.field_hs_page_components.yml index c7ad5fdc4..e7c24a7f7 100644 --- a/config/default/field.field.node.hs_basic_page.field_hs_page_components.yml +++ b/config/default/field.field.node.hs_basic_page.field_hs_page_components.yml @@ -8,7 +8,6 @@ dependencies: - paragraphs.paragraphs_type.hs_gradient_hero - paragraphs.paragraphs_type.hs_priv_collection - paragraphs.paragraphs_type.hs_priv_text_area - - paragraphs.paragraphs_type.hs_row - paragraphs.paragraphs_type.hs_spotlight - paragraphs.paragraphs_type.hs_timeline_item - paragraphs.paragraphs_type.hs_webform @@ -36,7 +35,6 @@ settings: hs_timeline_item: hs_timeline_item hs_webform: hs_webform hs_priv_collection: hs_priv_collection - hs_row: hs_row negate: 1 target_bundles_drag_drop: hs_accordion: @@ -75,9 +73,6 @@ settings: hs_priv_text_area: weight: -29 enabled: true - hs_row: - weight: -24 - enabled: true hs_spotlight: weight: -28 enabled: true diff --git a/config/default/field.field.node.hs_basic_page.field_hs_page_hero.yml b/config/default/field.field.node.hs_basic_page.field_hs_page_hero.yml index 67869ce43..b2c0c4fe5 100644 --- a/config/default/field.field.node.hs_basic_page.field_hs_page_hero.yml +++ b/config/default/field.field.node.hs_basic_page.field_hs_page_hero.yml @@ -71,9 +71,6 @@ settings: hs_priv_text_area: weight: -38 enabled: false - hs_row: - weight: -37 - enabled: false hs_spotlight: weight: -24 enabled: false diff --git a/config/default/field.field.node.hs_private_page.field_hs_priv_page_components.yml b/config/default/field.field.node.hs_private_page.field_hs_priv_page_components.yml index 11df5ec31..6717d2232 100644 --- a/config/default/field.field.node.hs_private_page.field_hs_priv_page_components.yml +++ b/config/default/field.field.node.hs_private_page.field_hs_priv_page_components.yml @@ -73,9 +73,6 @@ settings: hs_priv_text_area: weight: -45 enabled: true - hs_row: - weight: -27 - enabled: false hs_spotlight: weight: -26 enabled: false diff --git a/config/default/field.field.paragraph.hs_carousel.field_hs_carousel_slides.yml b/config/default/field.field.paragraph.hs_carousel.field_hs_carousel_slides.yml index 878fb4011..01d86201d 100644 --- a/config/default/field.field.paragraph.hs_carousel.field_hs_carousel_slides.yml +++ b/config/default/field.field.paragraph.hs_carousel.field_hs_carousel_slides.yml @@ -37,9 +37,6 @@ settings: hs_postcard: weight: 12 enabled: false - hs_row: - weight: 13 - enabled: false hs_text_area: weight: 14 enabled: false diff --git a/config/default/field.field.paragraph.hs_collection.field_hs_collection_items.yml b/config/default/field.field.paragraph.hs_collection.field_hs_collection_items.yml index cc960f5ec..e35d9ced5 100644 --- a/config/default/field.field.paragraph.hs_collection.field_hs_collection_items.yml +++ b/config/default/field.field.paragraph.hs_collection.field_hs_collection_items.yml @@ -11,7 +11,6 @@ dependencies: - paragraphs.paragraphs_type.hs_gradient_hero - paragraphs.paragraphs_type.hs_priv_collection - paragraphs.paragraphs_type.hs_priv_text_area - - paragraphs.paragraphs_type.hs_row - paragraphs.paragraphs_type.hs_sptlght_slder - paragraphs.paragraphs_type.hs_timeline_item - paragraphs.paragraphs_type.hs_webform @@ -40,7 +39,6 @@ settings: stanford_gallery: stanford_gallery hs_priv_collection: hs_priv_collection hs_priv_text_area: hs_priv_text_area - hs_row: hs_row hs_sptlght_slder: hs_sptlght_slder hs_timeline_item: hs_timeline_item hs_webform: hs_webform @@ -82,9 +80,6 @@ settings: hs_priv_text_area: weight: -32 enabled: true - hs_row: - weight: -31 - enabled: true hs_spotlight: weight: -30 enabled: false diff --git a/config/default/field.field.paragraph.hs_gradient_hero_slider.field_hs_gradient_hero_slides.yml b/config/default/field.field.paragraph.hs_gradient_hero_slider.field_hs_gradient_hero_slides.yml index d03607598..af6ad6889 100644 --- a/config/default/field.field.paragraph.hs_gradient_hero_slider.field_hs_gradient_hero_slides.yml +++ b/config/default/field.field.paragraph.hs_gradient_hero_slider.field_hs_gradient_hero_slides.yml @@ -58,9 +58,6 @@ settings: hs_private_files: weight: 30 enabled: false - hs_row: - weight: 32 - enabled: false hs_spotlight: weight: 33 enabled: false diff --git a/config/default/field.field.paragraph.hs_priv_collection.field_hs_collection_items.yml b/config/default/field.field.paragraph.hs_priv_collection.field_hs_collection_items.yml index 5adf2238b..0525f8e8e 100644 --- a/config/default/field.field.paragraph.hs_priv_collection.field_hs_collection_items.yml +++ b/config/default/field.field.paragraph.hs_priv_collection.field_hs_collection_items.yml @@ -67,9 +67,6 @@ settings: hs_priv_text_area: weight: 33 enabled: true - hs_row: - weight: 34 - enabled: false hs_spotlight: weight: 35 enabled: false diff --git a/config/default/field.field.paragraph.hs_row.field_hs_row_components.yml b/config/default/field.field.paragraph.hs_row.field_hs_row_components.yml deleted file mode 100644 index 1951b343a..000000000 --- a/config/default/field.field.paragraph.hs_row.field_hs_row_components.yml +++ /dev/null @@ -1,117 +0,0 @@ -uuid: 419725bc-a8af-43de-9ab5-941cf21e3219 -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_hs_row_components - - paragraphs.paragraphs_type.hs_callout_box - - paragraphs.paragraphs_type.hs_clr_bnd - - paragraphs.paragraphs_type.hs_collection - - paragraphs.paragraphs_type.hs_gradient_hero - - paragraphs.paragraphs_type.hs_priv_collection - - paragraphs.paragraphs_type.hs_priv_text_area - - paragraphs.paragraphs_type.hs_row - - paragraphs.paragraphs_type.hs_spotlight - - paragraphs.paragraphs_type.hs_sptlght_slder - - paragraphs.paragraphs_type.hs_timeline_item - - paragraphs.paragraphs_type.hs_webform - - paragraphs.paragraphs_type.stanford_gallery - module: - - entity_reference_revisions -_core: - default_config_hash: Lk2i-gZ3KutHJEqtINR6HcbP2N5EiEZtLSbN8g877MU -id: paragraph.hs_row.field_hs_row_components -field_name: field_hs_row_components -entity_type: paragraph -bundle: hs_row -label: Components -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - handler: 'default:paragraph' - handler_settings: - target_bundles: - hs_callout_box: hs_callout_box - hs_collection: hs_collection - hs_gradient_hero: hs_gradient_hero - stanford_gallery: stanford_gallery - hs_priv_text_area: hs_priv_text_area - hs_row: hs_row - hs_webform: hs_webform - hs_clr_bnd: hs_clr_bnd - hs_priv_collection: hs_priv_collection - hs_timeline_item: hs_timeline_item - hs_sptlght_slder: hs_sptlght_slder - hs_spotlight: hs_spotlight - negate: 1 - target_bundles_drag_drop: - hs_accordion: - weight: -38 - enabled: false - hs_banner: - weight: -35 - enabled: false - hs_callout_box: - weight: -28 - enabled: true - hs_carousel: - weight: -36 - enabled: false - hs_clr_bnd: - weight: 26 - enabled: true - hs_collection: - weight: -27 - enabled: true - hs_gradient_hero: - weight: -26 - enabled: true - hs_gradient_hero_slider: - weight: -37 - enabled: false - hs_hero_image: - weight: -34 - enabled: false - hs_postcard: - weight: -33 - enabled: false - hs_priv_collection: - weight: 32 - enabled: true - hs_priv_text_area: - weight: -24 - enabled: true - hs_row: - weight: -23 - enabled: true - hs_spotlight: - weight: 99 - enabled: false - hs_sptlght_slder: - weight: 99 - enabled: false - hs_testimonial: - weight: -31 - enabled: false - hs_text_area: - weight: -39 - enabled: false - hs_timeline: - weight: 0 - enabled: false - hs_timeline_item: - weight: 99 - enabled: true - hs_view: - weight: -29 - enabled: false - hs_webform: - weight: -21 - enabled: true - stanford_gallery: - weight: -25 - enabled: true -field_type: entity_reference_revisions diff --git a/config/default/field.field.paragraph.hs_row.field_paragraph_style.yml b/config/default/field.field.paragraph.hs_row.field_paragraph_style.yml deleted file mode 100644 index f02da455d..000000000 --- a/config/default/field.field.paragraph.hs_row.field_paragraph_style.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: 1f2d6b6a-bfb3-46ca-aca7-992f783eef22 -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_paragraph_style - - paragraphs.paragraphs_type.hs_row - module: - - options -id: paragraph.hs_row.field_paragraph_style -field_name: field_paragraph_style -entity_type: paragraph -bundle: hs_row -label: 'Paragraph Style' -description: 'Allows you to add styles to the background of the row.' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: { } -field_type: list_string diff --git a/config/default/field.field.paragraph.hs_sptlght_slder.field_hs_sptlght_sldes.yml b/config/default/field.field.paragraph.hs_sptlght_slder.field_hs_sptlght_sldes.yml index ef5151ce5..e7249eca3 100644 --- a/config/default/field.field.paragraph.hs_sptlght_slder.field_hs_sptlght_sldes.yml +++ b/config/default/field.field.paragraph.hs_sptlght_slder.field_hs_sptlght_sldes.yml @@ -58,9 +58,6 @@ settings: hs_priv_text_area: weight: 32 enabled: false - hs_row: - weight: 33 - enabled: false hs_spotlight: weight: 34 enabled: true diff --git a/config/default/field.field.paragraph.hs_timeline.field_hs_timeline.yml b/config/default/field.field.paragraph.hs_timeline.field_hs_timeline.yml index f606d2e94..544bec677 100644 --- a/config/default/field.field.paragraph.hs_timeline.field_hs_timeline.yml +++ b/config/default/field.field.paragraph.hs_timeline.field_hs_timeline.yml @@ -46,9 +46,6 @@ settings: hs_private_files: weight: 21 enabled: false - hs_row: - weight: 23 - enabled: false hs_spotlight: weight: 24 enabled: false diff --git a/config/default/field.storage.paragraph.field_hs_row_components.yml b/config/default/field.storage.paragraph.field_hs_row_components.yml deleted file mode 100644 index 7ce4c3837..000000000 --- a/config/default/field.storage.paragraph.field_hs_row_components.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: 1ec12a2f-a692-4bf1-b1d0-4a7e0349e7c5 -langcode: en -status: true -dependencies: - module: - - entity_reference_revisions - - paragraphs -_core: - default_config_hash: Q7cSeF_AZfPzqXLpUBTzf0a5OsDDwq-sd7QWbIFF3Ns -id: paragraph.field_hs_row_components -field_name: field_hs_row_components -entity_type: paragraph -type: entity_reference_revisions -settings: - target_type: paragraph -module: entity_reference_revisions -locked: false -cardinality: 4 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/default/paragraphs.paragraphs_type.hs_row.yml b/config/default/paragraphs.paragraphs_type.hs_row.yml deleted file mode 100644 index 8b6390fc5..000000000 --- a/config/default/paragraphs.paragraphs_type.hs_row.yml +++ /dev/null @@ -1,12 +0,0 @@ -uuid: 32fcb389-7dcd-42a5-a0b7-fb0759ac193f -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: mIGr5RpAFt4-ZXFDQzpwuie6BlMCF_w6BvI1vbIy_7I -id: hs_row -label: Row -icon_uuid: null -icon_default: null -description: 'Add multiple paragraphs in the same row.' -behavior_plugins: { } diff --git a/docroot/profiles/humsci/su_humsci_profile/drush.services.yml b/docroot/profiles/humsci/su_humsci_profile/drush.services.yml deleted file mode 100644 index 1aaed02bb..000000000 --- a/docroot/profiles/humsci/su_humsci_profile/drush.services.yml +++ /dev/null @@ -1,6 +0,0 @@ -services: - su_humsci_profile.commands: - class: \Drupal\su_humsci_profile\Commands\HumsciCommands - arguments: ['@entity_type.manager', '@module_handler'] - tags: - - { name: drush.command } diff --git a/docroot/profiles/humsci/su_humsci_profile/src/Commands/HumsciCommands.php b/docroot/profiles/humsci/su_humsci_profile/src/Commands/HumsciCommands.php deleted file mode 100644 index 1e6f5525e..000000000 --- a/docroot/profiles/humsci/su_humsci_profile/src/Commands/HumsciCommands.php +++ /dev/null @@ -1,112 +0,0 @@ -moduleHandler->loadInclude('su_humsci_profile', 'post_update.php'); - _su_humsci_profile_enable_paragraph('node', $node_type, $field_name, $collection_type); - - $paragraph_storage = $this->entityTypeManager->getStorage('paragraph'); - $nodes = $this->entityTypeManager->getStorage('node') - ->loadByProperties(['type' => $node_type]); - - /** @var \Drupal\node\NodeInterface $node */ - foreach ($nodes as $node) { - - $changed = FALSE; - $new_component_values = []; - $field_values = $node->get($field_name)->getValue(); - foreach ($field_values as $component) { - /** @var \Drupal\paragraphs\ParagraphInterface $paragraph */ - $paragraph = $paragraph_storage->load($component['target_id']); - - if ($paragraph->bundle() != 'hs_row') { - $new_component_values[] = $component; - continue; - } - $changed = TRUE; - $style = $paragraph->get('field_paragraph_style')->getString(); - $row_components = $paragraph->get('field_hs_row_components') - ->getValue(); - /** @var \Drupal\paragraphs\ParagraphInterface $collection */ - $collection = $paragraph_storage->create([ - 'type' => $collection_type, - 'field_hs_collection_per_row' => count($row_components), - 'field_paragraph_style' => $style, - ]); - $collection->save(); - $collection_components = []; - - foreach ($row_components as $row_component) { - /** @var \Drupal\paragraphs\ParagraphInterface $component */ - $component = $paragraph_storage->load($row_component['target_id']); - $new_component = $component->createDuplicate(); - $new_component->setParentEntity($collection, 'field_hs_collection_items'); - $new_component->save(); - $collection_components[] = [ - 'target_id' => $new_component->id(), - 'target_revision_id' => $new_component->getRevisionId(), - ]; - } - $collection->set('field_hs_collection_items', $collection_components) - ->save(); - - $new_component_values[] = [ - 'target_id' => $collection->id(), - 'target_revision_id' => $collection->getRevisionId(), - ]; - } - if ($changed) { - $node->setNewRevision(); - $node->set($field_name, $new_component_values) - ->save(); - } - } - - _su_humsci_profile_disable_paragraph('node', $node_type, $field_name, 'hs_row'); - } - - /** - * Convert row paragraphs to collections. - * - * @command humsci:rows-to-collection - */ - public function convertRowsToCollection() { - $this->rowsToCollections('hs_basic_page', 'field_hs_page_components', 'hs_collection'); - } - -} diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml index 3ae9561c3..591e26019 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml @@ -128,8 +128,6 @@ install: - 'humsci:hs_publications_display' - 'humsci:hs_research' - 'humsci:hs_research_display' - - 'humsci:hs_row' - - 'humsci:hs_row_display' - 'humsci:hs_table_filter' - 'humsci:hs_text_area' - 'humsci:hs_text_area_display' diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install index 6f144f5eb..415a8545e 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install @@ -13,6 +13,7 @@ use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; use Drupal\hs_entities\Entity\HsEntityType; use Drupal\node\NodeInterface; +use Drupal\paragraphs\Entity\ParagraphsType; use Drupal\user\RoleInterface; /** @@ -475,9 +476,9 @@ function su_humsci_profile_update_9701(&$sandbox) { $new_entity->save(); $sandbox['convert'][$eck_type][$id] = $new_entity->id(); - // Clear entity caches - $entity_type_manager->getStorage($eck_type)->resetCache(array($id)); - $entity_type_manager->getStorage('hs_entity')->resetCache(array($new_entity->id())); + // Clear entity caches. + $entity_type_manager->getStorage($eck_type)->resetCache([$id]); + $entity_type_manager->getStorage('hs_entity')->resetCache([$new_entity->id()]); } $sandbox['#finished'] = empty($sandbox['items']) ? 1 : ($sandbox['count'] - count($sandbox['items'])) / $sandbox['count']; @@ -903,7 +904,6 @@ function su_humsci_profile_update_9706() { return "Removed " . $count_config . " config dependencies and " . $count_module . " module dependencies."; } - /** * Delete eck configuration and uninstall eck module. */ @@ -916,7 +916,6 @@ function su_humsci_profile_update_9707() { \Drupal::service('module_installer')->uninstall(['eck']); } - /** * Uninstall page_cache. */ @@ -931,3 +930,66 @@ function su_humsci_profile_update_9709() { \Drupal::service('module_installer')->install(['paragraphs_features']); \Drupal::service('module_installer')->install(['paragraphs_ee']); } + +/** + * Remove any existing hs_row paragraph entities. + */ +function su_humsci_profile_update_9710($sandbox) { + $paragraph_storage = \Drupal::entityTypeManager()->getStorage('paragraph'); + $paragraph_machine_name = 'hs_row'; + + if (empty($sandbox['ids'])) { + $sandbox['ids'] = $paragraph_storage->getQuery() + ->condition('type', $paragraph_machine_name) + ->accessCheck(FALSE) + ->execute(); + $sandbox['total'] = count($sandbox['ids']); + } + $paragraph_ids = array_splice($sandbox['ids'], 0, 50); + + foreach ($paragraph_storage->loadMultiple($paragraph_ids) as $paragraph) { + $paragraph->delete(); + } + + $sandbox['#finished'] = count($sandbox['ids']) ? 1 - count($sandbox['ids']) / $sandbox['total'] : 1; +} + +/** + * Delete hs_row paragraph type. + */ +function su_humsci_profile_update_9711() { + $paragraph_machine_name = 'hs_row'; + // Delete the field and field storage on the paragraph. + $fields = \Drupal::entityTypeManager() + ->getStorage('field_config') + ->loadByProperties(['bundle' => $paragraph_machine_name]); + + if ($fields) { + foreach ($fields as $field) { + /** @var Drupal\field\Entity $field */ + + // Delete the field configuration (instance) from the paragraph type. + $field->delete(); + } + } + + // Delete the field_hs_row_components field storage. + $field_storage = FieldStorageConfig::load('field_hs_row_components'); + if ($field_storage) { + $field_storage->delete(); + } + + // Delete the paragraph itself. + $paragraph_type = ParagraphsType::load($paragraph_machine_name); + if ($paragraph_type) { + $paragraph_type->delete(); + } +} + +/** + * Uninstall hs_row modules. + */ +function su_humsci_profile_update_9712() { + // Uninstall hs_row and hs_row_display modules. + \Drupal::service('module_installer')->uninstall(['hs_row', 'hs_row_display']); +} diff --git a/docroot/themes/humsci/humsci_basic/docs/drupal-configuration-defaults.md b/docroot/themes/humsci/humsci_basic/docs/drupal-configuration-defaults.md index b732ad481..c57b85e5b 100644 --- a/docroot/themes/humsci/humsci_basic/docs/drupal-configuration-defaults.md +++ b/docroot/themes/humsci/humsci_basic/docs/drupal-configuration-defaults.md @@ -36,7 +36,7 @@ These settings can be found on the "Manage form display" tab on most Entity type - Adding a new Paragraphs component to the Flexible Page "Components" field? - New components should be added in alphabetical order AFTER Text Area. - - Adding a new Paragraphs component to the "Collection" or "Row" components list? + - Adding a new Paragraphs component to the "Collection" components list? - Components should be in alphabetical order. - [Paragraph Form Display Settings.](#paragraph-field-form-display) diff --git a/docroot/themes/humsci/humsci_basic/package-lock.json b/docroot/themes/humsci/humsci_basic/package-lock.json index 05328737b..f1ae57aa1 100644 --- a/docroot/themes/humsci/humsci_basic/package-lock.json +++ b/docroot/themes/humsci/humsci_basic/package-lock.json @@ -35,7 +35,7 @@ "sass": "^1.58.0", "sass-true": "^7.0.0", "shelljs": "^0.8.5", - "stylelint": "^16.5.0", + "stylelint": "^16.9.0", "stylelint-config-standard-scss": "^13.1.0", "webpack": "^5.75.0", "webpack-cli": "^5.0.1" @@ -1649,9 +1649,9 @@ } }, "node_modules/@csstools/css-parser-algorithms": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.6.3.tgz", - "integrity": "sha512-xI/tL2zxzEbESvnSxwFgwvy5HS00oCXxL4MLs6HUiDcYfwowsoQaABKxUElp1ARITrINzBnsECOc1q0eg2GOrA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.1.tgz", + "integrity": "sha512-lSquqZCHxDfuTg/Sk2hiS0mcSFCEBuj49JfzPHJogDBT0mGCyY5A1AQzBWngitrp7i1/HAZpIgzF/VjhOEIJIg==", "dev": true, "funding": [ { @@ -1664,16 +1664,16 @@ } ], "engines": { - "node": "^14 || ^16 || >=18" + "node": ">=18" }, "peerDependencies": { - "@csstools/css-tokenizer": "^2.3.1" + "@csstools/css-tokenizer": "^3.0.1" } }, "node_modules/@csstools/css-tokenizer": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.3.1.tgz", - "integrity": "sha512-iMNHTyxLbBlWIfGtabT157LH9DUx9X8+Y3oymFEuMj8HNc+rpE3dPFGFgHjpKfjeFDjLjYIAIhXPGvS2lKxL9g==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.1.tgz", + "integrity": "sha512-UBqaiu7kU0lfvaP982/o3khfXccVlHPWp0/vwwiIgDF0GmqqqxoiXC/6FCjlS9u92f7CoEz6nXKQnrn1kIAkOw==", "dev": true, "funding": [ { @@ -1686,13 +1686,13 @@ } ], "engines": { - "node": "^14 || ^16 || >=18" + "node": ">=18" } }, "node_modules/@csstools/media-query-list-parser": { - "version": "2.1.11", - "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.11.tgz", - "integrity": "sha512-uox5MVhvNHqitPP+SynrB1o8oPxPMt2JLgp5ghJOWf54WGQ5OKu47efne49r1SWqs3wRP8xSWjnO9MBKxhB1dA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-3.0.1.tgz", + "integrity": "sha512-HNo8gGD02kHmcbX6PvCoUuOQvn4szyB9ca63vZHKX5A81QytgDG4oxG4IaEfHTlEZSZ6MjPEMWIVU+zF2PZcgw==", "dev": true, "funding": [ { @@ -1705,17 +1705,17 @@ } ], "engines": { - "node": "^14 || ^16 || >=18" + "node": ">=18" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^2.6.3", - "@csstools/css-tokenizer": "^2.3.1" + "@csstools/css-parser-algorithms": "^3.0.1", + "@csstools/css-tokenizer": "^3.0.1" } }, "node_modules/@csstools/selector-specificity": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.3.tgz", - "integrity": "sha512-KEPNw4+WW5AVEIyzC80rTbWEUatTW2lXpN8+8ILC8PiPeWPjwUzrPZDIOZ2wwqDmeqOYTdSGyL3+vE5GC3FB3Q==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-4.0.0.tgz", + "integrity": "sha512-189nelqtPd8++phaHNwYovKZI0FOzH1vQEE3QhHHkNIGrg5fSs9CbYP3RvfEH5geztnIA9Jwq91wyOIwAW5JIQ==", "dev": true, "funding": [ { @@ -1728,10 +1728,10 @@ } ], "engines": { - "node": "^14 || ^16 || >=18" + "node": ">=18" }, "peerDependencies": { - "postcss-selector-parser": "^6.0.13" + "postcss-selector-parser": "^6.1.0" } }, "node_modules/@discoveryjs/json-ext": { @@ -1744,9 +1744,9 @@ } }, "node_modules/@dual-bundle/import-meta-resolve": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.0.0.tgz", - "integrity": "sha512-ZKXyJeFAzcpKM2kk8ipoGIPUqx9BX52omTGnfwjJvxOCaZTM2wtDK7zN0aIgPRbT9XYAlha0HtmZ+XKteuh0Gw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz", + "integrity": "sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==", "dev": true, "funding": { "type": "github", @@ -3297,12 +3297,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -4868,9 +4868,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -5955,9 +5955,9 @@ ] }, "node_modules/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", "dev": true, "engines": { "node": ">= 4" @@ -7102,12 +7102,12 @@ } }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -8035,9 +8035,9 @@ } }, "node_modules/postcss": { - "version": "8.4.38", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", - "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", + "version": "8.4.47", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz", + "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==", "dev": true, "funding": [ { @@ -8055,8 +8055,8 @@ ], "dependencies": { "nanoid": "^3.3.7", - "picocolors": "^1.0.0", - "source-map-js": "^1.2.0" + "picocolors": "^1.1.0", + "source-map-js": "^1.2.1" }, "engines": { "node": "^10 || ^12 || >=14" @@ -8069,9 +8069,9 @@ "dev": true }, "node_modules/postcss-resolve-nested-selector": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", - "integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz", + "integrity": "sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==", "dev": true }, "node_modules/postcss-safe-parser": { @@ -8127,9 +8127,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.16", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz", - "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", + "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", "dev": true, "dependencies": { "cssesc": "^3.0.0", @@ -8164,9 +8164,9 @@ } }, "node_modules/postcss/node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", "dev": true }, "node_modules/prelude-ls": { @@ -9079,9 +9079,9 @@ } }, "node_modules/source-map-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", - "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "dev": true, "engines": { "node": ">=0.10.0" @@ -9219,47 +9219,57 @@ } }, "node_modules/stylelint": { - "version": "16.5.0", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.5.0.tgz", - "integrity": "sha512-IlCBtVrG+qTy3v+tZTk50W8BIomjY/RUuzdrDqdnlCYwVuzXtPbiGfxYqtyYAyOMcb+195zRsuHn6tgfPmFfbw==", + "version": "16.9.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.9.0.tgz", + "integrity": "sha512-31Nm3WjxGOBGpQqF43o3wO9L5AC36TPIe6030Lnm13H3vDMTcS21DrLh69bMX+DBilKqMMVLian4iG6ybBoNRQ==", "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/stylelint" + }, + { + "type": "github", + "url": "https://github.com/sponsors/stylelint" + } + ], "dependencies": { - "@csstools/css-parser-algorithms": "^2.6.1", - "@csstools/css-tokenizer": "^2.2.4", - "@csstools/media-query-list-parser": "^2.1.9", - "@csstools/selector-specificity": "^3.0.3", - "@dual-bundle/import-meta-resolve": "^4.0.0", + "@csstools/css-parser-algorithms": "^3.0.1", + "@csstools/css-tokenizer": "^3.0.1", + "@csstools/media-query-list-parser": "^3.0.1", + "@csstools/selector-specificity": "^4.0.0", + "@dual-bundle/import-meta-resolve": "^4.1.0", "balanced-match": "^2.0.0", "colord": "^2.9.3", "cosmiconfig": "^9.0.0", "css-functions-list": "^3.2.2", "css-tree": "^2.3.1", - "debug": "^4.3.4", + "debug": "^4.3.6", "fast-glob": "^3.3.2", "fastest-levenshtein": "^1.0.16", - "file-entry-cache": "^8.0.0", + "file-entry-cache": "^9.0.0", "global-modules": "^2.0.0", "globby": "^11.1.0", "globjoin": "^0.1.4", "html-tags": "^3.3.1", - "ignore": "^5.3.1", + "ignore": "^5.3.2", "imurmurhash": "^0.1.4", "is-plain-object": "^5.0.0", - "known-css-properties": "^0.30.0", + "known-css-properties": "^0.34.0", "mathml-tag-names": "^2.1.3", "meow": "^13.2.0", - "micromatch": "^4.0.5", + "micromatch": "^4.0.8", "normalize-path": "^3.0.0", - "picocolors": "^1.0.0", - "postcss": "^8.4.38", - "postcss-resolve-nested-selector": "^0.1.1", + "picocolors": "^1.0.1", + "postcss": "^8.4.41", + "postcss-resolve-nested-selector": "^0.1.6", "postcss-safe-parser": "^7.0.0", - "postcss-selector-parser": "^6.0.16", + "postcss-selector-parser": "^6.1.2", "postcss-value-parser": "^4.2.0", "resolve-from": "^5.0.0", "string-width": "^4.2.3", "strip-ansi": "^7.1.0", - "supports-hyperlinks": "^3.0.0", + "supports-hyperlinks": "^3.1.0", "svg-tags": "^1.0.0", "table": "^6.8.2", "write-file-atomic": "^5.0.1" @@ -9269,10 +9279,6 @@ }, "engines": { "node": ">=18.12.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/stylelint" } }, "node_modules/stylelint-config-recommended": { @@ -9410,29 +9416,46 @@ } } }, + "node_modules/stylelint/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, "node_modules/stylelint/node_modules/file-entry-cache": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", - "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-9.1.0.tgz", + "integrity": "sha512-/pqPFG+FdxWQj+/WSuzXSDaNzxgTLr/OrR1QuqfEZzDakpdYE70PwUxL7BPUa8hpjbvY1+qvCl8k+8Tq34xJgg==", "dev": true, "dependencies": { - "flat-cache": "^4.0.0" + "flat-cache": "^5.0.0" }, "engines": { - "node": ">=16.0.0" + "node": ">=18" } }, "node_modules/stylelint/node_modules/flat-cache": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", - "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-5.0.0.tgz", + "integrity": "sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==", "dev": true, "dependencies": { - "flatted": "^3.2.9", + "flatted": "^3.3.1", "keyv": "^4.5.4" }, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/stylelint/node_modules/global-modules": { @@ -9470,10 +9493,22 @@ "node": ">=0.10.0" } }, + "node_modules/stylelint/node_modules/known-css-properties": { + "version": "0.34.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.34.0.tgz", + "integrity": "sha512-tBECoUqNFbyAY4RrbqsBQqDFpGXAEbdD5QKr8kACx3+rnArmuuR22nKQWKazvp07N9yjTyDZaw/20UIH8tL9DQ==", + "dev": true + }, + "node_modules/stylelint/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, "node_modules/stylelint/node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", "dev": true }, "node_modules/stylelint/node_modules/resolve-from": { @@ -9534,9 +9569,9 @@ } }, "node_modules/supports-hyperlinks": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz", - "integrity": "sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.1.0.tgz", + "integrity": "sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==", "dev": true, "dependencies": { "has-flag": "^4.0.0", @@ -9544,6 +9579,9 @@ }, "engines": { "node": ">=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/supports-hyperlinks/node_modules/has-flag": { diff --git a/docroot/themes/humsci/humsci_basic/package.json b/docroot/themes/humsci/humsci_basic/package.json index 96338a2e7..e1a9625c6 100644 --- a/docroot/themes/humsci/humsci_basic/package.json +++ b/docroot/themes/humsci/humsci_basic/package.json @@ -55,7 +55,7 @@ "sass": "^1.58.0", "sass-true": "^7.0.0", "shelljs": "^0.8.5", - "stylelint": "^16.5.0", + "stylelint": "^16.9.0", "stylelint-config-standard-scss": "^13.1.0", "webpack": "^5.75.0", "webpack-cli": "^5.0.1" diff --git a/docroot/themes/humsci/humsci_basic/src/scss/components/_card.scss b/docroot/themes/humsci/humsci_basic/src/scss/components/_card.scss index 7755778e9..e1ed14438 100644 --- a/docroot/themes/humsci/humsci_basic/src/scss/components/_card.scss +++ b/docroot/themes/humsci/humsci_basic/src/scss/components/_card.scss @@ -458,11 +458,10 @@ line-height: 119%; } - // If the heading is in a grid or row, + // If the heading is in a grid or collection, // keep it smaller longer. .hb-grid &, - .ptype-hs-collection &, - .ptype-hs-row & { + .ptype-hs-collection & { @include hb-themes(('colorful', 'airy')) { @include grid-media-min('sm') { font-size: hb-calculate-rems(18px); diff --git a/docroot/themes/humsci/humsci_basic/src/scss/components/_pattern.timeline-item.scss b/docroot/themes/humsci/humsci_basic/src/scss/components/_pattern.timeline-item.scss index 65268479d..7771221ff 100644 --- a/docroot/themes/humsci/humsci_basic/src/scss/components/_pattern.timeline-item.scss +++ b/docroot/themes/humsci/humsci_basic/src/scss/components/_pattern.timeline-item.scss @@ -45,7 +45,6 @@ } } - .field-hs-row-components[class*="counted-items-"] &, .field-hs-collection-items[class*="item-per-row--"] & { margin-bottom: 0 !important; } diff --git a/docroot/themes/humsci/humsci_basic/src/scss/components/_postcard.scss b/docroot/themes/humsci/humsci_basic/src/scss/components/_postcard.scss index a9acbb583..059ea4aec 100644 --- a/docroot/themes/humsci/humsci_basic/src/scss/components/_postcard.scss +++ b/docroot/themes/humsci/humsci_basic/src/scss/components/_postcard.scss @@ -12,8 +12,7 @@ h4, h5, h6 { - .hb-grid &, - .ptype-hs-row & { + .hb-grid & { font-size: hb-calculate-rems(22px); } } diff --git a/docroot/themes/humsci/humsci_basic/src/scss/components/_vertical-linked-card.scss b/docroot/themes/humsci/humsci_basic/src/scss/components/_vertical-linked-card.scss index af331fc5f..b4ad384b9 100644 --- a/docroot/themes/humsci/humsci_basic/src/scss/components/_vertical-linked-card.scss +++ b/docroot/themes/humsci/humsci_basic/src/scss/components/_vertical-linked-card.scss @@ -33,14 +33,6 @@ &__img { overflow: hidden; - @include hb-themes(('colorful', 'airy')) { - @include grid-media-min('sm') { - .field-hs-row-components & { - margin-top: hb-calculate-rems(-24px); - } - } - } - img { width: 100%; transition: hb-transition(transform); diff --git a/docroot/themes/humsci/humsci_basic/src/scss/objects/_layouts.general.scss b/docroot/themes/humsci/humsci_basic/src/scss/objects/_layouts.general.scss index 7cc63d44a..be9a52feb 100644 --- a/docroot/themes/humsci/humsci_basic/src/scss/objects/_layouts.general.scss +++ b/docroot/themes/humsci/humsci_basic/src/scss/objects/_layouts.general.scss @@ -62,7 +62,6 @@ .ptype-hs-carousel, .ptype-hs-sptlght-slder, .field-hs-page-hero, -.ptype-hs-row, .ptype-hs-timeline, .ptype-hs-view, .ptype-hs-collection, diff --git a/docroot/themes/humsci/humsci_basic/src/scss/objects/_layouts.row.scss b/docroot/themes/humsci/humsci_basic/src/scss/objects/_layouts.row.scss index 24054deb6..b09bdfb0a 100644 --- a/docroot/themes/humsci/humsci_basic/src/scss/objects/_layouts.row.scss +++ b/docroot/themes/humsci/humsci_basic/src/scss/objects/_layouts.row.scss @@ -1,4 +1,4 @@ -// Row Paragraph Styles +// Collection Paragraph Styles .hs-paragraph-style { &--well, &--well-full-width { @@ -6,12 +6,6 @@ padding: 0 hb-spacing-width(); overflow: auto; - .counted-items-2.field-hs-row-components > .paragraph-item, - .counted-items-3.field-hs-row-components > .paragraph-item, - .counted-items-4.field-hs-row-components > .paragraph-item, - .item-per-row--2.field-hs-row-components > .paragraph-item, - .item-per-row--3.field-hs-row-components > .paragraph-item, - .item-per-row--4.field-hs-row-components > .paragraph-item, .paragraph-item { .field__item__label { margin-top: 0; @@ -57,7 +51,6 @@ @include hb-page-width; } - .field-hs-row-components, .field-hs-collection-items { .hb-three-column--no-sidebar & { @include hb-page-width; @@ -76,7 +69,6 @@ // Decanter uses flexbox for row components. For modern browsers, let's use CSS Grid. // Collections items have been added to this group, base Collection styles here: docroot/modules/humsci/hs_paragraph_types/css/hs_collection.css -.field-hs-row-components, .field-hs-collection-items { // When there is more than one item in a row it uses grid @include grid-media-min('sm') { diff --git a/docroot/themes/humsci/humsci_basic/src/scss/utilities/_raised-cards.scss b/docroot/themes/humsci/humsci_basic/src/scss/utilities/_raised-cards.scss index 01fc928f6..88d041e09 100644 --- a/docroot/themes/humsci/humsci_basic/src/scss/utilities/_raised-cards.scss +++ b/docroot/themes/humsci/humsci_basic/src/scss/utilities/_raised-cards.scss @@ -1,9 +1,7 @@ .hb-raised-cards { // The uniform-height modifier adds the ability for cards to be consistent height regardless of content. &--uniform-height .hs-paragraph-style .ptype-hs-postcard, - &--uniform-height .field-hs-row-components .ptype-hs-postcard, &--uniform-height .hs-paragraph-style .hb-grid__item, - &--uniform-height .field-hs-row-components .hb-grid__item, &--uniform-height .hb-grid .hb-grid__item, &--uniform-height .field-hs-collection-items .ptype-hs-postcard { display: flex; @@ -14,9 +12,7 @@ } &--uniform-height .hs-paragraph-style .paragraph-item .hb-card, - &--uniform-height .field-hs-row-components .paragraph-item .hb-card, &--uniform-height .hs-paragraph-style .paragraph-item .hb-vertical-linked-card, - &--uniform-height .field-hs-row-components .paragraph-item .hb-vertical-linked-card, &--uniform-height .field-hs-collection-items .paragraph-item .hb-vertical-linked-card, &--uniform-height .field-hs-collection-items .paragraph-item .hb-card, &--uniform-height .hb-timeline, @@ -25,7 +21,6 @@ } // Raised cards uniform height styles for Testimonial & Timeline - &--uniform-height .field-hs-row-components .ptype-hs-testimonial, &--uniform-height .field-hs-collection-items .ptype-hs-testimonial, &--uniform-height .field-hs-collection-items .ptype-hs-timeline { & div:not([class]):only-child:not(.hb-card__date-tile, .hb-pill), // necessary for logged out state @@ -34,7 +29,6 @@ } } - &--uniform-height .field-hs-row-components .paragraph-item .hb-testimonial, &--uniform-height .field-hs-collection-items .paragraph-item .hb-testimonial { display: flex; height: inherit; diff --git a/docs/Codeception.md b/docs/Codeception.md index 79b4c68a4..6f26141ba 100644 --- a/docs/Codeception.md +++ b/docs/Codeception.md @@ -57,7 +57,6 @@ The following Codeception tests are currently run during a CI build. Unless othe * [Paragraphs](../tests/codeception/acceptance/Paragraphs/ParagraphsCest.php) * Tests specific paragraphs included/excluded from collections on: * Private Page - * Rows * Public Collections * Flexible Page * [Menu Items](../tests/codeception/acceptance/MenuItemsCest.php) @@ -87,6 +86,3 @@ The following Codeception tests are currently run during a CI build. Unless othe * Add top level and second level item * Toggles menu items * Mobile menu button and toggles - -## Disabled Acceptance Tests - * [Flexible Page - Row with Text Area](../tests/codeception/acceptance/Install/Content/FlexiblePageCest.php#L109) diff --git a/tests/codeception/acceptance/Install/Content/FlexiblePageCest.php b/tests/codeception/acceptance/Install/Content/FlexiblePageCest.php deleted file mode 100644 index c3b01e752..000000000 --- a/tests/codeception/acceptance/Install/Content/FlexiblePageCest.php +++ /dev/null @@ -1,34 +0,0 @@ -logInWithRole('contributor'); - $I->amOnPage('/node/add/hs_basic_page'); - $I->fillField('Title', 'Demo Basic Page'); - $I->click('#edit-field-hs-page-components-add-more-browse'); - $I->canSee('Browse'); - $I->canSee('Search'); - $I->canSee('Add'); - $I->click('Add', 'field_hs_page_components_hs_row_add_more'); - $I->canSee('Paragraph Style'); - $I->click('Add Text Area'); - $I->fillField('Text Area', 'Vivamus in erat ut urna cursus vestibulum. Sed augue ipsum, egestas nec, vestibulum et, malesuada adipiscing, dui. Curabitur suscipit suscipit tellus. Suspendisse enim turpis, dictum sed, iaculis a, condimentum nec, nisi. Nullam vel sem.'); - - $I->click('Save'); - $I->canSeeInCurrentUrl('/demo-basic-page'); - $I->canSee('Demo Basic Page', 'h1'); - $I->canSee('Vivamus in erat ut urna cursus vestibulum. Sed augue ipsum, egestas nec, vestibulum et, malesuada adipiscing, dui. Curabitur suscipit suscipit tellus. Suspendisse enim turpis, dictum sed, iaculis a, condimentum nec, nisi. Nullam vel sem.'); - } - -} diff --git a/tests/codeception/acceptance/Paragraphs/ParagraphsCest.php b/tests/codeception/acceptance/Paragraphs/ParagraphsCest.php index 3c1fc3d9b..fe3bd50ed 100644 --- a/tests/codeception/acceptance/Paragraphs/ParagraphsCest.php +++ b/tests/codeception/acceptance/Paragraphs/ParagraphsCest.php @@ -19,11 +19,6 @@ public function testPrivateCollectionParagraph(AcceptanceTester $I) { $I->amOnPage('/admin/structure/types/manage/hs_private_page/fields/node.hs_private_page.field_hs_priv_page_components'); $I->canSeeCheckboxIsChecked('Include the selected below'); - // Disabled in rows. - $I->amOnPage('/admin/structure/paragraphs_type/hs_row/fields/paragraph.hs_row.field_hs_row_components'); - $I->canSeeCheckboxIsChecked('Exclude the selected below'); - $I->canSeeCheckboxIsChecked('settings[handler_settings][target_bundles_drag_drop][hs_priv_collection][enabled]'); - // Disabled in public collections. $I->amOnPage('/admin/structure/paragraphs_type/hs_collection/fields/paragraph.hs_collection.field_hs_collection_items'); $I->canSeeCheckboxIsChecked('Exclude the selected below'); From 0f6d8dd060ad65297f61261803cd320dc0740a4f Mon Sep 17 00:00:00 2001 From: Marc Berger <107938318+codechefmarc@users.noreply.github.com> Date: Thu, 17 Oct 2024 13:28:46 -0700 Subject: [PATCH 3/8] SHS-5785: New Well Color for Collections: Cleanup (#1622) * SHS-5785: New Well Color for Collections: Cleanup. --- ...isplay.paragraph.hs_collection.default.yml | 2 -- ...y.paragraph.hs_priv_collection.default.yml | 2 -- ...isplay.paragraph.hs_collection.default.yml | 2 -- ...y.paragraph.hs_priv_collection.default.yml | 2 -- ...ph.hs_collection.field_paragraph_style.yml | 21 ------------------- ..._priv_collection.field_paragraph_style.yml | 21 ------------------- .../hs_paragraph_types.install | 12 +++++++++++ .../7dc29316-7055-454e-be0f-9b6314348920.yml | 3 --- 8 files changed, 12 insertions(+), 53 deletions(-) delete mode 100644 config/default/field.field.paragraph.hs_collection.field_paragraph_style.yml delete mode 100644 config/default/field.field.paragraph.hs_priv_collection.field_paragraph_style.yml diff --git a/config/default/core.entity_form_display.paragraph.hs_collection.default.yml b/config/default/core.entity_form_display.paragraph.hs_collection.default.yml index 9ddcdc122..ec2bbaea9 100644 --- a/config/default/core.entity_form_display.paragraph.hs_collection.default.yml +++ b/config/default/core.entity_form_display.paragraph.hs_collection.default.yml @@ -8,7 +8,6 @@ dependencies: - field.field.paragraph.hs_collection.field_hs_collection_items - field.field.paragraph.hs_collection.field_hs_collection_per_row - field.field.paragraph.hs_collection.field_hs_collection_uh - - field.field.paragraph.hs_collection.field_paragraph_style - field.field.paragraph.hs_collection.field_raised_cards - field.field.paragraph.hs_collection.field_title - field.field.paragraph.hs_collection.field_title_settings @@ -139,5 +138,4 @@ content: third_party_settings: { } hidden: created: true - field_paragraph_style: true status: true diff --git a/config/default/core.entity_form_display.paragraph.hs_priv_collection.default.yml b/config/default/core.entity_form_display.paragraph.hs_priv_collection.default.yml index 57cd28023..33eded754 100644 --- a/config/default/core.entity_form_display.paragraph.hs_priv_collection.default.yml +++ b/config/default/core.entity_form_display.paragraph.hs_priv_collection.default.yml @@ -8,7 +8,6 @@ dependencies: - field.field.paragraph.hs_priv_collection.field_hs_collection_items - field.field.paragraph.hs_priv_collection.field_hs_collection_per_row - field.field.paragraph.hs_priv_collection.field_hs_collection_uh - - field.field.paragraph.hs_priv_collection.field_paragraph_style - field.field.paragraph.hs_priv_collection.field_raised_cards - paragraphs.paragraphs_type.hs_priv_collection module: @@ -121,5 +120,4 @@ content: third_party_settings: { } hidden: created: true - field_paragraph_style: true status: true diff --git a/config/default/core.entity_view_display.paragraph.hs_collection.default.yml b/config/default/core.entity_view_display.paragraph.hs_collection.default.yml index 8ec480b2b..8a03fa843 100644 --- a/config/default/core.entity_view_display.paragraph.hs_collection.default.yml +++ b/config/default/core.entity_view_display.paragraph.hs_collection.default.yml @@ -8,7 +8,6 @@ dependencies: - field.field.paragraph.hs_collection.field_hs_collection_items - field.field.paragraph.hs_collection.field_hs_collection_per_row - field.field.paragraph.hs_collection.field_hs_collection_uh - - field.field.paragraph.hs_collection.field_paragraph_style - field.field.paragraph.hs_collection.field_raised_cards - field.field.paragraph.hs_collection.field_title - field.field.paragraph.hs_collection.field_title_settings @@ -51,7 +50,6 @@ hidden: field_bg_color_width: true field_hs_collection_per_row: true field_hs_collection_uh: true - field_paragraph_style: true field_raised_cards: true field_title_settings: true search_api_excerpt: true diff --git a/config/default/core.entity_view_display.paragraph.hs_priv_collection.default.yml b/config/default/core.entity_view_display.paragraph.hs_priv_collection.default.yml index 891d7254c..0b082dcc9 100644 --- a/config/default/core.entity_view_display.paragraph.hs_priv_collection.default.yml +++ b/config/default/core.entity_view_display.paragraph.hs_priv_collection.default.yml @@ -8,7 +8,6 @@ dependencies: - field.field.paragraph.hs_priv_collection.field_hs_collection_items - field.field.paragraph.hs_priv_collection.field_hs_collection_per_row - field.field.paragraph.hs_priv_collection.field_hs_collection_uh - - field.field.paragraph.hs_priv_collection.field_paragraph_style - field.field.paragraph.hs_priv_collection.field_raised_cards - paragraphs.paragraphs_type.hs_priv_collection module: @@ -32,6 +31,5 @@ hidden: field_bg_color_width: true field_hs_collection_per_row: true field_hs_collection_uh: true - field_paragraph_style: true field_raised_cards: true search_api_excerpt: true diff --git a/config/default/field.field.paragraph.hs_collection.field_paragraph_style.yml b/config/default/field.field.paragraph.hs_collection.field_paragraph_style.yml deleted file mode 100644 index 2d49f46d4..000000000 --- a/config/default/field.field.paragraph.hs_collection.field_paragraph_style.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: d59b90db-18d9-40a3-8ed4-b0056f2edebe -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_paragraph_style - - paragraphs.paragraphs_type.hs_collection - module: - - options -id: paragraph.hs_collection.field_paragraph_style -field_name: field_paragraph_style -entity_type: paragraph -bundle: hs_collection -label: 'Background Color (old)' -description: '' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: { } -field_type: list_string diff --git a/config/default/field.field.paragraph.hs_priv_collection.field_paragraph_style.yml b/config/default/field.field.paragraph.hs_priv_collection.field_paragraph_style.yml deleted file mode 100644 index c91ecac77..000000000 --- a/config/default/field.field.paragraph.hs_priv_collection.field_paragraph_style.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: 92208510-64a6-4941-928a-26702e478338 -langcode: en -status: true -dependencies: - config: - - field.storage.paragraph.field_paragraph_style - - paragraphs.paragraphs_type.hs_priv_collection - module: - - options -id: paragraph.hs_priv_collection.field_paragraph_style -field_name: field_paragraph_style -entity_type: paragraph -bundle: hs_priv_collection -label: 'Style (old)' -description: '' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: { } -field_type: list_string diff --git a/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install b/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install index f4a3ae1a9..012655950 100644 --- a/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install +++ b/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install @@ -364,3 +364,15 @@ function hs_paragraph_types_update_10009() { } } } + +/** + * Removes legacy background color field from collection and priv collection. + */ +function hs_paragraph_types_update_10010() { + if ($hs_collection_style = FieldConfig::loadByName('paragraph', 'hs_collection', 'field_paragraph_style')) { + $hs_collection_style->delete(); + } + if ($hs_priv_collection_style = FieldConfig::loadByName('paragraph', 'hs_priv_collection', 'field_paragraph_style')) { + $hs_priv_collection_style->delete(); + } +} diff --git a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/content/node/7dc29316-7055-454e-be0f-9b6314348920.yml b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/content/node/7dc29316-7055-454e-be0f-9b6314348920.yml index 72b7d7990..d5581a23a 100644 --- a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/content/node/7dc29316-7055-454e-be0f-9b6314348920.yml +++ b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/content/node/7dc29316-7055-454e-be0f-9b6314348920.yml @@ -85,9 +85,6 @@ default: field_hs_collection_per_row: - value: 1 - field_paragraph_style: - - - value: well - entity: _meta: From dd73e0111c7c5b7263f627923fce5fb8e885b46e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20D=C3=ADaz=20Soto?= Date: Thu, 17 Oct 2024 16:21:32 -0600 Subject: [PATCH 4/8] SHS-5868: Uninstall admin_login_path module (#1652) * SHS-5868: Uninstall admin_login_path module. --- .../humsci/su_humsci_profile/su_humsci_profile.info.yml | 1 - .../humsci/su_humsci_profile/su_humsci_profile.install | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml index 591e26019..e46ff0f35 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml @@ -52,7 +52,6 @@ dependencies: - 'drupal:views_ui' install: - 'address:address' - - 'admin_login_path:admin_login_path' - 'admin_toolbar:admin_toolbar' - 'admin_toolbar:admin_toolbar_links_access_filter' - 'admin_toolbar:admin_toolbar_tools' diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install index 415a8545e..3dbaa95ba 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install @@ -993,3 +993,10 @@ function su_humsci_profile_update_9712() { // Uninstall hs_row and hs_row_display modules. \Drupal::service('module_installer')->uninstall(['hs_row', 'hs_row_display']); } + +/** + * Uninstall admin_login_path module. + */ +function su_humsci_profile_update_9713() { + \Drupal::service('module_installer')->uninstall(['admin_login_path']); +} From c7c02a90da527e730540df5a73fa1b90fed6c621 Mon Sep 17 00:00:00 2001 From: CircleCI Date: Fri, 18 Oct 2024 14:13:36 +0000 Subject: [PATCH 5/8] Updated dependencies --- composer.lock | 201 ++++++++++++++++++++++++++------------------------ 1 file changed, 103 insertions(+), 98 deletions(-) diff --git a/composer.lock b/composer.lock index 0ebb1e3bb..80e551f9d 100644 --- a/composer.lock +++ b/composer.lock @@ -937,16 +937,16 @@ }, { "name": "consolidation/output-formatters", - "version": "4.5.0", + "version": "4.6.0", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "7a611b01eb48eb19cd54672339fc08c0985bf540" + "reference": "5fd5656718d7068a02d046f418a7ba873d5abbfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/7a611b01eb48eb19cd54672339fc08c0985bf540", - "reference": "7a611b01eb48eb19cd54672339fc08c0985bf540", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/5fd5656718d7068a02d046f418a7ba873d5abbfe", + "reference": "5fd5656718d7068a02d046f418a7ba873d5abbfe", "shasum": "" }, "require": { @@ -985,9 +985,9 @@ "description": "Format text by applying transformations provided by plug-in formatters.", "support": { "issues": "https://github.com/consolidation/output-formatters/issues", - "source": "https://github.com/consolidation/output-formatters/tree/4.5.0" + "source": "https://github.com/consolidation/output-formatters/tree/4.6.0" }, - "time": "2024-04-02T15:18:52+00:00" + "time": "2024-10-18T14:02:48+00:00" }, { "name": "consolidation/robo", @@ -2362,7 +2362,7 @@ "homepage": "https://www.drupal.org/user/52136" }, { - "name": "Pravin Ajaaz", + "name": "pravin ajaaz", "homepage": "https://www.drupal.org/user/2910049" }, { @@ -3894,16 +3894,16 @@ }, { "name": "drupal/core", - "version": "10.2.9", + "version": "10.2.10", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "d57f82577f99e57a819cc8be304c00a06ad349fe" + "reference": "cc654a9fd9d7b149b9c554a9114610681a22c343" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/d57f82577f99e57a819cc8be304c00a06ad349fe", - "reference": "d57f82577f99e57a819cc8be304c00a06ad349fe", + "url": "https://api.github.com/repos/drupal/core/zipball/cc654a9fd9d7b149b9c554a9114610681a22c343", + "reference": "cc654a9fd9d7b149b9c554a9114610681a22c343", "shasum": "" }, "require": { @@ -4051,13 +4051,13 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.2.9" + "source": "https://github.com/drupal/core/tree/10.2.10" }, - "time": "2024-10-08T11:27:57+00:00" + "time": "2024-10-16T00:22:27+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.2.9", + "version": "10.2.10", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -4101,22 +4101,22 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.2.9" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.2.10" }, "time": "2024-04-09T07:27:23+00:00" }, { "name": "drupal/core-recommended", - "version": "10.2.9", + "version": "10.2.10", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "4629116a19425c5c16a9ad01e03f9bc86c360400" + "reference": "92d4eda171aba18bd1d6b2a3837f16d3f3e3e95b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/4629116a19425c5c16a9ad01e03f9bc86c360400", - "reference": "4629116a19425c5c16a9ad01e03f9bc86c360400", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/92d4eda171aba18bd1d6b2a3837f16d3f3e3e95b", + "reference": "92d4eda171aba18bd1d6b2a3837f16d3f3e3e95b", "shasum": "" }, "require": { @@ -4125,7 +4125,7 @@ "doctrine/annotations": "~1.14.3", "doctrine/deprecations": "~1.1.2", "doctrine/lexer": "~2.1.0", - "drupal/core": "10.2.9", + "drupal/core": "10.2.10", "egulias/email-validator": "~4.0.2", "guzzlehttp/guzzle": "~7.8.1", "guzzlehttp/promises": "~2.0.2", @@ -4186,9 +4186,9 @@ ], "description": "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.", "support": { - "source": "https://github.com/drupal/core-recommended/tree/10.2.9" + "source": "https://github.com/drupal/core-recommended/tree/10.2.10" }, - "time": "2024-10-08T11:27:57+00:00" + "time": "2024-10-16T00:22:27+00:00" }, { "name": "drupal/crop", @@ -7694,26 +7694,26 @@ }, { "name": "drupal/layout_builder_modal", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/layout_builder_modal.git", - "reference": "8.x-1.2" + "reference": "8.x-1.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/layout_builder_modal-8.x-1.2.zip", - "reference": "8.x-1.2", - "shasum": "9031696991d8746f5cc9ad47f47398ac2a0cbda1" + "url": "https://ftp.drupal.org/files/projects/layout_builder_modal-8.x-1.3.zip", + "reference": "8.x-1.3", + "shasum": "7aa935803b19cc46c3806e8e367d6c0e3ef1a32e" }, "require": { - "drupal/core": "^9.2|^10.0" + "drupal/core": "^9.5 || ^10.2 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.2", - "datestamp": "1670939257", + "version": "8.x-1.3", + "datestamp": "1729151918", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7757,17 +7757,17 @@ }, { "name": "drupal/linkit", - "version": "6.1.4", + "version": "6.1.6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/linkit.git", - "reference": "6.1.4" + "reference": "6.1.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/linkit-6.1.4.zip", - "reference": "6.1.4", - "shasum": "f5544a39d691af5efd1532bd5403862a7153f60b" + "url": "https://ftp.drupal.org/files/projects/linkit-6.1.6.zip", + "reference": "6.1.6", + "shasum": "113d8e569cfb92f8d7feb0a2f7713953c0715e92" }, "require": { "drupal/core": "^10.1" @@ -7779,8 +7779,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.1.4", - "datestamp": "1715203830", + "version": "6.1.6", + "datestamp": "1729189029", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -11476,17 +11476,17 @@ }, { "name": "drupal/ui_patterns", - "version": "1.9.0", + "version": "1.10.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/ui_patterns.git", - "reference": "8.x-1.9" + "reference": "8.x-1.10" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/ui_patterns-8.x-1.9.zip", - "reference": "8.x-1.9", - "shasum": "35eabe1f655df98f6f3cb68a62a98f8d41b52f0c" + "url": "https://ftp.drupal.org/files/projects/ui_patterns-8.x-1.10.zip", + "reference": "8.x-1.10", + "shasum": "bdb6f84ae8b82679380641cdc3d78b0fafe98614" }, "require": { "drupal/core": "^9 || ^10 || ^11" @@ -11498,8 +11498,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.9", - "datestamp": "1724936358", + "version": "8.x-1.10", + "datestamp": "1729182058", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -11713,7 +11713,7 @@ "homepage": "https://www.drupal.org/user/282415" }, { - "name": "Sam152", + "name": "sam152", "homepage": "https://www.drupal.org/user/1485048" } ], @@ -13544,16 +13544,16 @@ }, { "name": "guzzlehttp/promises", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8" + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", - "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", + "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455", + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455", "shasum": "" }, "require": { @@ -13607,7 +13607,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.3" + "source": "https://github.com/guzzle/promises/tree/2.0.4" }, "funding": [ { @@ -13623,7 +13623,7 @@ "type": "tidelift" } ], - "time": "2024-07-18T10:29:17+00:00" + "time": "2024-10-17T10:06:22+00:00" }, { "name": "guzzlehttp/psr7", @@ -14027,16 +14027,16 @@ }, { "name": "league/csv", - "version": "9.17.0", + "version": "9.18.0", "source": { "type": "git", "url": "https://github.com/thephpleague/csv.git", - "reference": "8cab815fb11ec93aa2f7b8a57b3daa1f1a364011" + "reference": "b02d010e4055ae992247f6ffd1e7b103ef2a0790" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/csv/zipball/8cab815fb11ec93aa2f7b8a57b3daa1f1a364011", - "reference": "8cab815fb11ec93aa2f7b8a57b3daa1f1a364011", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/b02d010e4055ae992247f6ffd1e7b103ef2a0790", + "reference": "b02d010e4055ae992247f6ffd1e7b103ef2a0790", "shasum": "" }, "require": { @@ -14048,11 +14048,11 @@ "ext-xdebug": "*", "friendsofphp/php-cs-fixer": "^3.64.0", "phpbench/phpbench": "^1.3.1", - "phpstan/phpstan": "^1.12.5", + "phpstan/phpstan": "^1.12.6", "phpstan/phpstan-deprecation-rules": "^1.2.1", "phpstan/phpstan-phpunit": "^1.4.0", "phpstan/phpstan-strict-rules": "^1.6.1", - "phpunit/phpunit": "^10.5.16 || ^11.4.0", + "phpunit/phpunit": "^10.5.16 || ^11.4.1", "symfony/var-dumper": "^6.4.8 || ^7.1.5" }, "suggest": { @@ -14110,7 +14110,7 @@ "type": "github" } ], - "time": "2024-10-10T10:30:28+00:00" + "time": "2024-10-18T08:14:48+00:00" }, { "name": "loophp/phposinfo", @@ -21127,17 +21127,17 @@ }, { "name": "drupal/upgrade_status", - "version": "4.3.5", + "version": "4.3.6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/upgrade_status.git", - "reference": "4.3.5" + "reference": "4.3.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/upgrade_status-4.3.5.zip", - "reference": "4.3.5", - "shasum": "353c17f14c855f5ba0fe48c6a4f6486360c066a7" + "url": "https://ftp.drupal.org/files/projects/upgrade_status-4.3.6.zip", + "reference": "4.3.6", + "shasum": "8169732d814034f541238d67ba31300825a61aca" }, "require": { "dekor/php-array-table": "^2.0", @@ -21154,8 +21154,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.3.5", - "datestamp": "1723044184", + "version": "4.3.6", + "datestamp": "1729173427", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -21173,7 +21173,7 @@ ], "authors": [ { - "name": "Gábor Hojtsy", + "name": "gábor hojtsy", "homepage": "https://www.drupal.org/user/4166" } ], @@ -21905,16 +21905,16 @@ }, { "name": "open-telemetry/api", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/api.git", - "reference": "62f2abc4c6d4ef6ea897256520052f9c29a0241f" + "reference": "542064815d38a6df55af7957cd6f1d7d967c99c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/62f2abc4c6d4ef6ea897256520052f9c29a0241f", - "reference": "62f2abc4c6d4ef6ea897256520052f9c29a0241f", + "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/542064815d38a6df55af7957cd6f1d7d967c99c6", + "reference": "542064815d38a6df55af7957cd6f1d7d967c99c6", "shasum": "" }, "require": { @@ -21930,6 +21930,11 @@ "extra": { "branch-alias": { "dev-main": "1.1.x-dev" + }, + "spi": { + "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\HookManagerInterface": [ + "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\ExtensionHookManager" + ] } }, "autoload": { @@ -21966,7 +21971,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-09-24T23:58:09+00:00" + "time": "2024-10-15T22:42:37+00:00" }, { "name": "open-telemetry/context", @@ -22156,16 +22161,16 @@ }, { "name": "open-telemetry/sdk", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/sdk.git", - "reference": "be2bb8de6db9eeb11d964b3b1949f6e0f6b08e9b" + "reference": "126319e6b3996c609fded69f1e3e9dc1582c64af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/be2bb8de6db9eeb11d964b3b1949f6e0f6b08e9b", - "reference": "be2bb8de6db9eeb11d964b3b1949f6e0f6b08e9b", + "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/126319e6b3996c609fded69f1e3e9dc1582c64af", + "reference": "126319e6b3996c609fded69f1e3e9dc1582c64af", "shasum": "" }, "require": { @@ -22242,7 +22247,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-09-25T11:54:21+00:00" + "time": "2024-10-15T22:42:37+00:00" }, { "name": "open-telemetry/sem-conv", @@ -23128,16 +23133,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.6", + "version": "1.12.7", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae" + "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc4d2f145a88ea7141ae698effd64d9df46527ae", - "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", + "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", "shasum": "" }, "require": { @@ -23182,7 +23187,7 @@ "type": "github" } ], - "time": "2024-10-06T15:03:59+00:00" + "time": "2024-10-18T11:12:07+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -25035,12 +25040,12 @@ "source": { "type": "git", "url": "https://github.com/SU-SWS/blt-sws.git", - "reference": "e8688984fe4f699aae61d991deb2dec5718a26bf" + "reference": "083f9b8137c86315f0362443ad126833a1817602" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SU-SWS/blt-sws/zipball/e8688984fe4f699aae61d991deb2dec5718a26bf", - "reference": "e8688984fe4f699aae61d991deb2dec5718a26bf", + "url": "https://api.github.com/repos/SU-SWS/blt-sws/zipball/083f9b8137c86315f0362443ad126833a1817602", + "reference": "083f9b8137c86315f0362443ad126833a1817602", "shasum": "" }, "require": { @@ -25071,7 +25076,7 @@ "issues": "https://github.com/SU-SWS/blt-sws/issues", "source": "https://github.com/SU-SWS/blt-sws/tree/main" }, - "time": "2024-04-29T22:02:00+00:00" + "time": "2024-10-17T00:11:29+00:00" }, { "name": "su-sws/drupal-dev", @@ -25132,12 +25137,12 @@ "source": { "type": "git", "url": "https://github.com/SU-SWS/stanford-caravan.git", - "reference": "a76c7229dfd688758b6cd08c7fdce1d4929bca33" + "reference": "8d648373190f664fd05ae9d39686209e7d508272" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SU-SWS/stanford-caravan/zipball/a76c7229dfd688758b6cd08c7fdce1d4929bca33", - "reference": "a76c7229dfd688758b6cd08c7fdce1d4929bca33", + "url": "https://api.github.com/repos/SU-SWS/stanford-caravan/zipball/8d648373190f664fd05ae9d39686209e7d508272", + "reference": "8d648373190f664fd05ae9d39686209e7d508272", "shasum": "" }, "require": { @@ -25167,7 +25172,7 @@ "issues": "https://github.com/SU-SWS/stanford-caravan/issues", "source": "https://github.com/SU-SWS/stanford-caravan/tree/10.x" }, - "time": "2024-09-10T20:13:48+00:00" + "time": "2024-10-11T15:29:49+00:00" }, { "name": "symfony/browser-kit", @@ -25958,16 +25963,16 @@ }, { "name": "typhonius/acquia-php-sdk-v2", - "version": "3.3.1", + "version": "3.3.2", "source": { "type": "git", "url": "https://github.com/typhonius/acquia-php-sdk-v2.git", - "reference": "7cc0c773ea15d82ab7268266097c846d5814be87" + "reference": "c6c8370e84e11d1ee18d89a3b5a4d5a8ed0b4474" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/typhonius/acquia-php-sdk-v2/zipball/7cc0c773ea15d82ab7268266097c846d5814be87", - "reference": "7cc0c773ea15d82ab7268266097c846d5814be87", + "url": "https://api.github.com/repos/typhonius/acquia-php-sdk-v2/zipball/c6c8370e84e11d1ee18d89a3b5a4d5a8ed0b4474", + "reference": "c6c8370e84e11d1ee18d89a3b5a4d5a8ed0b4474", "shasum": "" }, "require": { @@ -26011,7 +26016,7 @@ "description": "A PHP SDK for Acquia CloudAPI v2", "support": { "issues": "https://github.com/typhonius/acquia-php-sdk-v2/issues", - "source": "https://github.com/typhonius/acquia-php-sdk-v2/tree/3.3.1" + "source": "https://github.com/typhonius/acquia-php-sdk-v2/tree/3.3.2" }, "funding": [ { @@ -26019,7 +26024,7 @@ "type": "github" } ], - "time": "2024-08-18T17:56:11+00:00" + "time": "2024-10-10T19:26:23+00:00" }, { "name": "webmozart/assert", @@ -26105,14 +26110,14 @@ "drupal/views_ical": 15, "drupal/webform": 10, "onlyextart/colorbox": 20, - "su-sws/blt-sws": 20, - "su-sws/stanford_basic": 20 + "su-sws/stanford_basic": 20, + "su-sws/blt-sws": 20 }, "prefer-stable": true, "prefer-lowest": false, "platform": { "php": ">=8.2" }, - "platform-dev": {}, + "platform-dev": [], "plugin-api-version": "2.6.0" } From 1154cb1dea1feb3201a0c9d90b8d5301980d3408 Mon Sep 17 00:00:00 2001 From: ahughes3 <669850+ahughes3@users.noreply.github.com> Date: Fri, 18 Oct 2024 13:48:19 -0500 Subject: [PATCH 6/8] Update config.yml to add economics as a tugboat preview --- .tugboat/config.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.tugboat/config.yml b/.tugboat/config.yml index aa0b90251..642339daa 100644 --- a/.tugboat/config.yml +++ b/.tugboat/config.yml @@ -17,7 +17,7 @@ services: aliases: - hs-colorful - hs-traditional - - english + - economics # A set of commands to run while building this service commands: @@ -68,9 +68,9 @@ services: - drush @hs_traditional.local eval '\Drupal::moduleHandler()->loadInclude("user", "install");user_update_10000();' - blt drupal:update --site=hs_traditional - - drush @english.local cr - - drush @english.local eval '\Drupal::moduleHandler()->loadInclude("user", "install");user_update_10000();' - - blt drupal:update --site=english + - drush @economics.local cr + - drush @economics.local eval '\Drupal::moduleHandler()->loadInclude("user", "install");user_update_10000();' + - blt drupal:update --site=economics - npm run theme-build @@ -90,7 +90,7 @@ services: # Delete and recreate the database for each site. - mysql -e "DROP DATABASE IF EXISTS hs_colorful; CREATE DATABASE hs_colorful;" - mysql -e "DROP DATABASE IF EXISTS hs_traditional; CREATE DATABASE hs_traditional;" - - mysql -e "DROP DATABASE IF EXISTS english; CREATE DATABASE english;" + - mysql -e "DROP DATABASE IF EXISTS english; CREATE DATABASE economics;" # Give the tugboat user access to the new databases. - mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'tugboat'; FLUSH PRIVILEGES;" @@ -98,12 +98,12 @@ services: # Download each database dump. - scp humscigryphon.prod@web-42199.prod.hosting.acquia.com:/mnt/gfs/humscigryphon.prod/backups/prod-hs_colorful-humscigrydb423120-`date -d '8 hours ago' +%Y-%m-%d`.sql.gz /tmp/hs_colorful.sql.gz - scp humscigryphon.prod@web-42199.prod.hosting.acquia.com:/mnt/gfs/humscigryphon.prod/backups/prod-hs_traditional-humscigrydb423132-`date -d '8 hours ago' +%Y-%m-%d`.sql.gz /tmp/hs_traditional.sql.gz - - scp humscigryphon.prod@web-42199.prod.hosting.acquia.com:/mnt/gfs/humscigryphon.prod/backups/prod-english-humscigrydb423084-`date -d '8 hours ago' +%Y-%m-%d`.sql.gz /tmp/english.sql.gz + - scp humscigryphon.prod@web-42199.prod.hosting.acquia.com:/mnt/gfs/humscigryphon.prod/backups/prod-economics-humscigrydb423080-`date -d '8 hours ago' +%Y-%m-%d`.sql.gz /tmp/english.sql.gz # Import each database dump into the associated table. - zcat /tmp/hs_colorful.sql.gz | mysql hs_colorful - zcat /tmp/hs_traditional.sql.gz | mysql hs_traditional - - zcat /tmp/english.sql.gz | mysql english + - zcat /tmp/english.sql.gz | mysql economics # Clean up after ourselves to keep the Preview size small. - rm /tmp/*.sql.gz From 0cf413fcd4d7030da3e2234181caae9728ff8202 Mon Sep 17 00:00:00 2001 From: ahughes3 <669850+ahughes3@users.noreply.github.com> Date: Fri, 18 Oct 2024 13:51:39 -0500 Subject: [PATCH 7/8] Create ci.settings.php for economics --- .../sites/economics/settings/ci.settings.php | 155 ++++++++++++++++++ 1 file changed, 155 insertions(+) create mode 100644 docroot/sites/economics/settings/ci.settings.php diff --git a/docroot/sites/economics/settings/ci.settings.php b/docroot/sites/economics/settings/ci.settings.php new file mode 100644 index 000000000..12ffe4c3e --- /dev/null +++ b/docroot/sites/economics/settings/ci.settings.php @@ -0,0 +1,155 @@ + + [ + 'default' => + [ + 'database' => 'economics', + 'username' => 'tugboat', + 'password' => 'tugboat', + 'host' => 'mysql', + 'port' => '3306', + 'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql', + 'driver' => 'mysql', + 'prefix' => '', + ], + ], + ]; +} + + +// Use development service parameters. +$settings['container_yamls'][] = EnvironmentDetector::getRepoRoot() . '/docroot/sites/development.services.yml'; +$settings['container_yamls'][] = EnvironmentDetector::getRepoRoot() . '/docroot/sites/blt.development.services.yml'; + +// Allow access to update.php. +$settings['update_free_access'] = TRUE; + +/** + * Assertions. + * + * The Drupal project primarily uses runtime assertions to enforce the + * expectations of the API by failing when incorrect calls are made by code + * under development. + * + * @see http://php.net/assert + * @see https://www.drupal.org/node/2492225 + * + * If you are using PHP 7.0 it is strongly recommended that you set + * zend.assertions=1 in the PHP.ini file (It cannot be changed from .htaccess + * or runtime) on development machines and to 0 in production. + * + * @see https://wiki.php.net/rfc/expectations + */ +assert_options(ASSERT_ACTIVE, TRUE); +assert_options(ASSERT_EXCEPTION, TRUE); + +/** + * Show all error messages, with backtrace information. + * + * In case the error level could not be fetched from the database, as for + * example the database connection failed, we rely only on this value. + */ +$config['system.logging']['error_level'] = 'verbose'; + +/** + * Disable CSS and JS aggregation. + */ +$config['system.performance']['css']['preprocess'] = FALSE; +$config['system.performance']['js']['preprocess'] = FALSE; + +/** + * Disable the render cache (this includes the page cache). + * + * Note: you should test with the render cache enabled, to ensure the correct + * cacheability metadata is present. However, in the early stages of + * development, you may want to disable it. + * + * This setting disables the render cache by using the Null cache back-end + * defined by the development.services.yml file above. + * + * Do not use this setting until after the site is installed. + */ +// $settings['cache']['bins']['render'] = 'cache.backend.null'; +/** + * Disable Dynamic Page Cache. + * + * Note: you should test with Dynamic Page Cache enabled, to ensure the correct + * cacheability metadata is present (and hence the expected behavior). However, + * in the early stages of development, you may want to disable it. + */ +// $settings['cache']['bins']['dynamic_page_cache'] = 'cache.backend.null'; +/** + * Allow test modules and themes to be installed. + * + * Drupal ignores test modules and themes by default for performance reasons. + * During development it can be useful to install test extensions for debugging + * purposes. + */ +$settings['extension_discovery_scan_tests'] = FALSE; + + +/** + * Configure static caches. + * + * Note: you should test with the config, bootstrap, and discovery caches + * enabled to test that metadata is cached as expected. However, in the early + * stages of development, you may want to disable them. Overrides to these bins + * must be explicitly set for each bin to change the default configuration + * provided by Drupal core in core.services.yml. + * See https://www.drupal.org/node/2754947 + */ + +// $settings['cache']['bins']['bootstrap'] = 'cache.backend.null'; +// $settings['cache']['bins']['discovery'] = 'cache.backend.null'; +// $settings['cache']['bins']['config'] = 'cache.backend.null'; +/** + * Enable access to rebuild.php. + * + * This setting can be enabled to allow Drupal's php and database cached + * storage to be cleared via the rebuild.php page. Access to this page can also + * be gained by generating a query string from rebuild_token_calculator.sh and + * using these parameters in a request to rebuild.php. + */ +$settings['rebuild_access'] = FALSE; + +/** + * Skip file system permissions hardening. + * + * The system module will periodically check the permissions of your site's + * site directory to ensure that it is not writable by the website user. For + * sites that are managed with a version control system, this can cause problems + * when files in that directory such as settings.php are updated, because the + * user pulling in the changes won't have permissions to modify files in the + * directory. + */ +$settings['skip_permissions_hardening'] = TRUE; + +/** + * Files paths. + */ +$settings['file_private_path'] = EnvironmentDetector::getRepoRoot() . '/files-private/default'; +/** + * Site path. + * + * @var $site_path + * This is always set and exposed by the Drupal Kernel. + */ +// phpcs:ignore +$settings['file_public_path'] = 'sites/' . EnvironmentDetector::getSiteName($site_path) . '/files'; + +/** + * Trusted host configuration. + * + * See full description in default.settings.php. + */ +$settings['trusted_host_patterns'] = [ + '^.+$', +]; From b87742fb380dd2a6cc50e28bb7e209cad6217651 Mon Sep 17 00:00:00 2001 From: ahughes3 <669850+ahughes3@users.noreply.github.com> Date: Tue, 22 Oct 2024 16:55:00 -0500 Subject: [PATCH 8/8] Update config.yml --- .tugboat/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.tugboat/config.yml b/.tugboat/config.yml index 642339daa..b08bcb726 100644 --- a/.tugboat/config.yml +++ b/.tugboat/config.yml @@ -52,7 +52,7 @@ services: - drush @hs_traditional.local user:create tugboat --password=tugboat || true - drush @hs_traditional.local user:role:add administrator tugboat || true - - blt drupal:sync:files --site=english + - blt drupal:sync:files --site=economics - chown -R www-data:www-data ${TUGBOAT_ROOT}/docroot/sites/*/files build: @@ -90,7 +90,7 @@ services: # Delete and recreate the database for each site. - mysql -e "DROP DATABASE IF EXISTS hs_colorful; CREATE DATABASE hs_colorful;" - mysql -e "DROP DATABASE IF EXISTS hs_traditional; CREATE DATABASE hs_traditional;" - - mysql -e "DROP DATABASE IF EXISTS english; CREATE DATABASE economics;" + - mysql -e "DROP DATABASE IF EXISTS economics; CREATE DATABASE economics;" # Give the tugboat user access to the new databases. - mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'tugboat'; FLUSH PRIVILEGES;" @@ -98,12 +98,12 @@ services: # Download each database dump. - scp humscigryphon.prod@web-42199.prod.hosting.acquia.com:/mnt/gfs/humscigryphon.prod/backups/prod-hs_colorful-humscigrydb423120-`date -d '8 hours ago' +%Y-%m-%d`.sql.gz /tmp/hs_colorful.sql.gz - scp humscigryphon.prod@web-42199.prod.hosting.acquia.com:/mnt/gfs/humscigryphon.prod/backups/prod-hs_traditional-humscigrydb423132-`date -d '8 hours ago' +%Y-%m-%d`.sql.gz /tmp/hs_traditional.sql.gz - - scp humscigryphon.prod@web-42199.prod.hosting.acquia.com:/mnt/gfs/humscigryphon.prod/backups/prod-economics-humscigrydb423080-`date -d '8 hours ago' +%Y-%m-%d`.sql.gz /tmp/english.sql.gz + - scp humscigryphon.prod@web-42199.prod.hosting.acquia.com:/mnt/gfs/humscigryphon.prod/backups/prod-economics-humscigrydb423080-`date -d '8 hours ago' +%Y-%m-%d`.sql.gz /tmp/economics.sql.gz # Import each database dump into the associated table. - zcat /tmp/hs_colorful.sql.gz | mysql hs_colorful - zcat /tmp/hs_traditional.sql.gz | mysql hs_traditional - - zcat /tmp/english.sql.gz | mysql economics + - zcat /tmp/economics.sql.gz | mysql economics # Clean up after ourselves to keep the Preview size small. - rm /tmp/*.sql.gz