diff --git a/composer.json b/composer.json index 38cde120..1842790b 100644 --- a/composer.json +++ b/composer.json @@ -51,6 +51,7 @@ "drupal/paragraph_view_mode": "^3.1", "drupal/paragraphs": "^1.18", "drupal/pathauto": "^1.13", + "drupal/rabbit_hole": "^1.0", "drupal/redirect": "^1.10", "drupal/remove_username": "^1.5", "drupal/require_revision_log_message": "^2.0", diff --git a/composer.lock b/composer.lock index 5a4810ba..255faeca 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5aa796bcea4717b46dc5417befc2b876", + "content-hash": "9abf24fd54c05bed4d4207e4906ffcfb", "packages": [ { "name": "asm89/stack-cors", @@ -4085,6 +4085,85 @@ "documentation": "https://www.drupal.org/docs/8/modules/pathauto" } }, + { + "name": "drupal/rabbit_hole", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/rabbit_hole.git", + "reference": "8.x-1.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/rabbit_hole-8.x-1.0.zip", + "reference": "8.x-1.0", + "shasum": "9fd3129b27cd10e23a775719770bf2bda977c234" + }, + "require": { + "drupal/core": "^9.5 || ^10 || ^11" + }, + "require-dev": { + "drupal/commerce": "^2.39", + "drupal/commerce_product": "*", + "drupal/file_entity": "*", + "drupal/group": "*", + "drupal/paragraphs-paragraphs_library": "*" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.0", + "datestamp": "1721413113", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "aleksey.tk", + "homepage": "https://www.drupal.org/user/22093" + }, + { + "name": "bohart", + "homepage": "https://www.drupal.org/user/289861" + }, + { + "name": "Dylan Donkersgoed", + "homepage": "https://www.drupal.org/user/2803351" + }, + { + "name": "japerry", + "homepage": "https://www.drupal.org/user/45640" + }, + { + "name": "matroskeen", + "homepage": "https://www.drupal.org/user/3426249" + }, + { + "name": "mparker17", + "homepage": "https://www.drupal.org/user/536298" + }, + { + "name": "Odd Hill", + "homepage": "https://www.drupal.org/user/789934" + }, + { + "name": "olofbokedal", + "homepage": "https://www.drupal.org/user/1198438" + } + ], + "description": "Basic functionality that is shared among the different Rabbit Hole modules.", + "homepage": "https://www.drupal.org/project/rabbit_hole", + "support": { + "source": "https://git.drupalcode.org/project/rabbit_hole" + } + }, { "name": "drupal/rat", "version": "1.0.0", diff --git a/composer.log b/composer.log index f0205819..4ca3570b 100644 --- a/composer.log +++ b/composer.log @@ -56,3 +56,4 @@ bd7840ebd67d69715dbd07eef9ceb742|cathybaptista|feature/DIGITAL-114-implement-ide b9a62f1676c64c163727b0feef5db80f|christian medders|feature/DIGITAL-40-gtm|Fri Dec 20 15:46:24 EST 2024|./composer.sh require drupal/google_tag:^2.0 0e651880d7500538af3077d6462f9562|Matt Poole|feature/DIGITAL-158-log-stdout|Fri Jan 3 15:16:26 EST 2025|./composer.sh require drupal/log_stdout:^1.5 cfff5655249d219415af160348b125c3|christian medders|feature/DIGITAL-143-topics-field-update|Mon Jan 6 09:55:32 EST 2025|./composer.sh require drupal/autocomplete_deluxe:^2.1 +652fb1da8ec252a44bd251452e4d5782|Oscar Merida|feature/DIGITAL-141-rabbit-hole-config|Mon Jan 6 10:29:35 EST 2025|./composer.sh require drupal/rabbit_hole diff --git a/composer.sh b/composer.sh index c4fadf2f..ca58ef2a 100755 --- a/composer.sh +++ b/composer.sh @@ -47,6 +47,21 @@ if [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then exit "${EXIT_STATUS}" fi branch=$(git rev-parse --abbrev-ref HEAD) + # If rebasing, the branch name will be HEAD. Use another method to get it.\ + # Digital.gov custom change. + if [[ "$branch" = 'HEAD' ]]; then + rebasing-branch() { + for location in rebase-merge rebase-apply; do + path=$(git rev-parse --git-path ${location}) + if test -d ${path}; then + revision=$(<${path}/head-name) + echo ${revision##refs/heads/} + return 0 + fi + done + } + branch=$(rebasing-branch) + fi date=$(date) email=$(git config user.name) echo -e "$hash|$email|$branch|$date|./composer.sh $*" >> composer.log diff --git a/config/sync/core.entity_form_display.node.source.default.yml b/config/sync/core.entity_form_display.node.source.default.yml index 4ccedc83..ba8ebdb5 100644 --- a/config/sync/core.entity_form_display.node.source.default.yml +++ b/config/sync/core.entity_form_display.node.source.default.yml @@ -5,6 +5,7 @@ dependencies: config: - field.field.node.source.field_logo - node.type.source + - workflows.workflow.editorial module: - content_moderation - media_library diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 81642fc7..2d69559c 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -68,9 +68,13 @@ module: paragraphs_type_permissions: 0 path: 0 path_alias: 0 + rabbit_hole: 0 redirect: 0 remove_username: 0 require_revision_log_message: 0 + rh_node: 0 + rh_taxonomy: 0 + rh_user: 0 role_delegation: 0 scheduler: 0 scheduler_content_moderation_integration: 0 diff --git a/config/sync/rabbit_hole.behavior_settings.default.yml b/config/sync/rabbit_hole.behavior_settings.default.yml new file mode 100644 index 00000000..649a5b54 --- /dev/null +++ b/config/sync/rabbit_hole.behavior_settings.default.yml @@ -0,0 +1,14 @@ +uuid: e2a2604a-fb71-48a5-8d58-787d06ddf62a +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: hzh9CgsYCGxPEcbR3ieT1la6e43lMv-ivoN7oZJKkQQ +id: default +entity_type_id: null +entity_id: null +action: display_page +allow_override: 1 +redirect: '' +redirect_code: 0 +redirect_fallback_action: access_denied diff --git a/config/sync/rabbit_hole.behavior_settings.default_bundle.yml b/config/sync/rabbit_hole.behavior_settings.default_bundle.yml new file mode 100644 index 00000000..d2838909 --- /dev/null +++ b/config/sync/rabbit_hole.behavior_settings.default_bundle.yml @@ -0,0 +1,14 @@ +uuid: b2c7c3fe-42c4-4049-865d-820948f883de +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: qUkgsWZRCa_sLIn5JsMzB3xnx5ekIsVeGGZr7T0s9MY +id: default_bundle +entity_type_id: null +entity_id: null +action: display_page +allow_override: 1 +redirect: '' +redirect_code: 0 +redirect_fallback_action: access_denied diff --git a/config/sync/rabbit_hole.behavior_settings.node_type_guide_navigation.yml b/config/sync/rabbit_hole.behavior_settings.node_type_guide_navigation.yml new file mode 100644 index 00000000..fc8c6152 --- /dev/null +++ b/config/sync/rabbit_hole.behavior_settings.node_type_guide_navigation.yml @@ -0,0 +1,14 @@ +uuid: a007a973-c123-413a-af5a-e68673cacaae +langcode: en +status: true +dependencies: + config: + - node.type.guide_navigation +id: node_type_guide_navigation +entity_type_id: node_type +entity_id: guide_navigation +action: page_not_found +allow_override: 0 +redirect: '' +redirect_code: 301 +redirect_fallback_action: access_denied diff --git a/config/sync/rabbit_hole.behavior_settings.node_type_short_post.yml b/config/sync/rabbit_hole.behavior_settings.node_type_short_post.yml new file mode 100644 index 00000000..a17ec2e5 --- /dev/null +++ b/config/sync/rabbit_hole.behavior_settings.node_type_short_post.yml @@ -0,0 +1,14 @@ +uuid: e0003873-f144-4454-9f45-9aac7623e22c +langcode: en +status: true +dependencies: + config: + - node.type.short_post +id: node_type_short_post +entity_type_id: node_type +entity_id: short_post +action: access_denied +allow_override: 0 +redirect: '' +redirect_code: 301 +redirect_fallback_action: access_denied diff --git a/config/sync/rabbit_hole.behavior_settings.node_type_source.yml b/config/sync/rabbit_hole.behavior_settings.node_type_source.yml new file mode 100644 index 00000000..336ada7a --- /dev/null +++ b/config/sync/rabbit_hole.behavior_settings.node_type_source.yml @@ -0,0 +1,14 @@ +uuid: 5000fcb9-708b-4375-bfb1-3f8115984777 +langcode: en +status: true +dependencies: + config: + - node.type.source +id: node_type_source +entity_type_id: node_type +entity_id: source +action: access_denied +allow_override: 0 +redirect: '' +redirect_code: 301 +redirect_fallback_action: access_denied diff --git a/config/sync/rabbit_hole.behavior_settings.taxonomy_vocabulary_hcd_glossary.yml b/config/sync/rabbit_hole.behavior_settings.taxonomy_vocabulary_hcd_glossary.yml new file mode 100644 index 00000000..2809f867 --- /dev/null +++ b/config/sync/rabbit_hole.behavior_settings.taxonomy_vocabulary_hcd_glossary.yml @@ -0,0 +1,14 @@ +uuid: a55f5974-b3f0-4cf4-9e1e-e6770804a6cf +langcode: en +status: true +dependencies: + config: + - taxonomy.vocabulary.hcd_glossary +id: taxonomy_vocabulary_hcd_glossary +entity_type_id: taxonomy_vocabulary +entity_id: hcd_glossary +action: page_not_found +allow_override: 0 +redirect: '' +redirect_code: 301 +redirect_fallback_action: access_denied diff --git a/config/sync/rabbit_hole.behavior_settings.taxonomy_vocabulary_resource_topics.yml b/config/sync/rabbit_hole.behavior_settings.taxonomy_vocabulary_resource_topics.yml new file mode 100644 index 00000000..9a6cd1a0 --- /dev/null +++ b/config/sync/rabbit_hole.behavior_settings.taxonomy_vocabulary_resource_topics.yml @@ -0,0 +1,14 @@ +uuid: d93cb688-7923-4e55-af83-d6f649a8ad31 +langcode: en +status: true +dependencies: + config: + - taxonomy.vocabulary.resource_topics +id: taxonomy_vocabulary_resource_topics +entity_type_id: taxonomy_vocabulary +entity_id: resource_topics +action: page_not_found +allow_override: 0 +redirect: '' +redirect_code: 301 +redirect_fallback_action: access_denied diff --git a/config/sync/rabbit_hole.behavior_settings.user.yml b/config/sync/rabbit_hole.behavior_settings.user.yml new file mode 100644 index 00000000..45bbbd6d --- /dev/null +++ b/config/sync/rabbit_hole.behavior_settings.user.yml @@ -0,0 +1,12 @@ +uuid: facd069e-16bc-4925-9264-0accc72d8357 +langcode: en +status: true +dependencies: { } +id: user +entity_type_id: user +entity_id: null +action: page_not_found +allow_override: 0 +redirect: '' +redirect_code: 301 +redirect_fallback_action: access_denied