diff --git a/composer.json b/composer.json index 3a7a1932..d8a8c854 100644 --- a/composer.json +++ b/composer.json @@ -34,6 +34,7 @@ "drupal/admin_toolbar": "^3.1", "drupal/advanced_search": "^2.1", "drupal/better_exposed_filters": "^7.0", + "drupal/blockgroup": "^2.0", "drupal/citation_select": "^2.0@beta", "drupal/coi": "^4.0", "drupal/config_update": "^2.0@alpha", @@ -127,6 +128,9 @@ ] }, "patches": { + "drupal/islandora": { + "Allow node_has_term and node_is_islandora_object conditions to be used in Block visibility": "https://patch-diff.githubusercontent.com/raw/Islandora/islandora/pull/1084.patch" + }, "twistor/flysystem-stream-wrapper": { "PHP 8.2 deprecation warning": "assets/patches/flysystem-stream-wrapper.patch" } diff --git a/composer.lock b/composer.lock index ef716615..05f2d9ba 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": "a3a2527a7a0360249836ffef74f3533d", + "content-hash": "a6775004c847ba4acc50c92083c23446", "packages": [ { "name": "adci/full-name-parser", @@ -1854,6 +1854,62 @@ "issues": "https://www.drupal.org/project/issues/better_exposed_filters" } }, + { + "name": "drupal/blockgroup", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/blockgroup.git", + "reference": "2.0.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/blockgroup-2.0.1.zip", + "reference": "2.0.1", + "shasum": "8a1fb93fb1ff31e34009952c714bfc3fa3877644" + }, + "require": { + "drupal/core": "^9.1 || ^10 || ^11" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.1", + "datestamp": "1736667895", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "geek-merlin", + "homepage": "https://www.drupal.org/user/229048" + }, + { + "name": "kiss.jozsef", + "homepage": "https://www.drupal.org/user/2848443" + }, + { + "name": "leymannx", + "homepage": "https://www.drupal.org/user/2482808" + }, + { + "name": "znerol", + "homepage": "https://www.drupal.org/user/63999" + } + ], + "description": "Add block groups to block configuration page.", + "homepage": "https://www.drupal.org/project/blockgroup", + "support": { + "source": "https://git.drupalcode.org/project/blockgroup" + } + }, { "name": "drupal/citation_select", "version": "2.0.0-beta2", @@ -7329,7 +7385,7 @@ "version": "5", "dist": { "type": "zip", - "url": "https://github.com/mozilla/pdf.js/releases/download/v5.3.31/pdfjs-5.3.31-dist.zip" + "url": "https://github.com/mozilla/pdf.js/releases/download/v5.3.93/pdfjs-5.3.93-dist.zip" }, "type": "drupal-library" }, diff --git a/config/sync/block.block.creatorsandcontributors.yml b/config/sync/block.block.creatorsandcontributors.yml index 7f509d48..cd8a987a 100644 --- a/config/sync/block.block.creatorsandcontributors.yml +++ b/config/sync/block.block.creatorsandcontributors.yml @@ -7,7 +7,6 @@ dependencies: module: - context - facets - - islandora theme: - olivero _core: @@ -26,11 +25,6 @@ settings: context_mapping: { } block_id: creatorsandcontributors visibility: - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' user_status: id: user_status negate: false diff --git a/config/sync/block.block.creatorsandcontributors_swc.yml b/config/sync/block.block.creatorsandcontributors_swc.yml index 9d3d685f..a72cfbcb 100644 --- a/config/sync/block.block.creatorsandcontributors_swc.yml +++ b/config/sync/block.block.creatorsandcontributors_swc.yml @@ -5,14 +5,12 @@ dependencies: config: - facets.facet.creators_and_contributors_swc module: - - context - facets - - islandora theme: - olivero id: creatorsandcontributors_swc theme: olivero -region: sidebar +region: collection_sidebar_region weight: -12 provider: null plugin: 'facet_block:creators_and_contributors_swc' @@ -23,24 +21,4 @@ settings: provider: facets context_mapping: { } block_id: creatorsandcontributors_swc -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' +visibility: { } diff --git a/config/sync/block.block.memberof.yml b/config/sync/block.block.memberof.yml index 4f972d03..b9a28e90 100644 --- a/config/sync/block.block.memberof.yml +++ b/config/sync/block.block.memberof.yml @@ -7,7 +7,6 @@ dependencies: module: - context - facets - - islandora theme: - olivero id: memberof @@ -35,11 +34,6 @@ visibility: own_page_true: '0' field_value: '0' user_fields: uid - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' view_inclusion: id: view_inclusion negate: false diff --git a/config/sync/block.block.memberofswc.yml b/config/sync/block.block.memberofswc.yml index fa255f99..89e72b98 100644 --- a/config/sync/block.block.memberofswc.yml +++ b/config/sync/block.block.memberofswc.yml @@ -5,14 +5,12 @@ dependencies: config: - facets.facet.member_of_swc module: - - context - facets - - islandora theme: - olivero id: memberofswc theme: olivero -region: sidebar +region: collection_sidebar_region weight: 1 provider: null plugin: 'facet_block:member_of_swc' @@ -23,24 +21,4 @@ settings: provider: facets context_mapping: { } block_id: memberofswc -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' +visibility: { } diff --git a/config/sync/block.block.olivero_citationselectblock.yml b/config/sync/block.block.olivero_citationselectblock.yml new file mode 100644 index 00000000..a07d6bfa --- /dev/null +++ b/config/sync/block.block.olivero_citationselectblock.yml @@ -0,0 +1,33 @@ +uuid: 20a29e83-1e3f-4113-b45f-ec07191930f8 +langcode: en +status: true +dependencies: + module: + - citation_select + - islandora + theme: + - olivero +id: olivero_citationselectblock +theme: olivero +region: content +weight: -20 +provider: null +plugin: citation_select_block +settings: + id: citation_select_block + label: 'Citation Select Block' + label_display: '0' + provider: citation_select +visibility: + node_has_term: + id: node_has_term + negate: true + context_mapping: + node: '@node.node_route_context:node' + uri: 'http://purl.org/dc/dcmitype/Collection' + logic: and + node_is_islandora_object: + id: node_is_islandora_object + negate: 0 + context_mapping: + node: '@node.node_route_context:node' diff --git a/config/sync/block.block.olivero_collectioncontentregion.yml b/config/sync/block.block.olivero_collectioncontentregion.yml new file mode 100644 index 00000000..69a6be41 --- /dev/null +++ b/config/sync/block.block.olivero_collectioncontentregion.yml @@ -0,0 +1,30 @@ +uuid: f23baf7c-bbe3-4494-955b-16813f3f1137 +langcode: en +status: true +dependencies: + config: + - blockgroup.block_group_content.collection_content_region + module: + - blockgroup + - islandora + theme: + - olivero +id: olivero_collectioncontentregion +theme: olivero +region: content +weight: -21 +provider: null +plugin: 'block_group:collection_content_region' +settings: + id: 'block_group:collection_content_region' + label: 'Collection (Content region)' + label_display: '0' + provider: blockgroup +visibility: + node_has_term: + id: node_has_term + negate: false + context_mapping: + node: '@node.node_route_context:node' + uri: 'http://purl.org/dc/dcmitype/Collection,http://vocab.getty.edu/aat/300242735' + logic: or diff --git a/config/sync/block.block.olivero_collectionsidebarregion.yml b/config/sync/block.block.olivero_collectionsidebarregion.yml new file mode 100644 index 00000000..746d7a90 --- /dev/null +++ b/config/sync/block.block.olivero_collectionsidebarregion.yml @@ -0,0 +1,30 @@ +uuid: 569ab1f9-e0e9-4e25-a1af-0e9d57fbe60c +langcode: en +status: true +dependencies: + config: + - blockgroup.block_group_content.collection_sidebar_region + module: + - blockgroup + - islandora + theme: + - olivero +id: olivero_collectionsidebarregion +theme: olivero +region: sidebar +weight: 0 +provider: null +plugin: 'block_group:collection_sidebar_region' +settings: + id: 'block_group:collection_sidebar_region' + label: 'Collection (Sidebar region)' + label_display: '0' + provider: blockgroup +visibility: + node_has_term: + id: node_has_term + negate: false + context_mapping: + node: '@node.node_route_context:node' + uri: 'http://purl.org/dc/dcmitype/Collection,http://vocab.getty.edu/aat/300242735' + logic: or diff --git a/config/sync/block.block.olivero_content.yml b/config/sync/block.block.olivero_content.yml index 0de8e2c5..b105b398 100644 --- a/config/sync/block.block.olivero_content.yml +++ b/config/sync/block.block.olivero_content.yml @@ -11,7 +11,7 @@ _core: id: olivero_content theme: olivero region: content -weight: -11 +weight: -22 provider: null plugin: system_main_block settings: diff --git a/config/sync/block.block.olivero_miradorblock.yml b/config/sync/block.block.olivero_miradorblock.yml new file mode 100644 index 00000000..1a41e0d0 --- /dev/null +++ b/config/sync/block.block.olivero_miradorblock.yml @@ -0,0 +1,29 @@ +uuid: 5865823a-befd-4e7a-9a11-d26688646218 +langcode: en +status: true +dependencies: + module: + - islandora + - islandora_mirador + theme: + - olivero +id: olivero_miradorblock +theme: olivero +region: repository_item_media_viewers +weight: 0 +provider: null +plugin: mirador_block +settings: + id: mirador_block + label: 'Mirador Block - Multipaged items' + label_display: '0' + provider: islandora_mirador + iiif_manifest_url: '/node/[node:nid]/book-manifest' +visibility: + node_has_term: + id: node_has_term + negate: false + context_mapping: + node: '@node.node_route_context:node' + uri: 'https://schema.org/Book,https://schema.org/PublicationIssue' + logic: or diff --git a/config/sync/block.block.olivero_miradorblock_2.yml b/config/sync/block.block.olivero_miradorblock_2.yml new file mode 100644 index 00000000..6d471dfd --- /dev/null +++ b/config/sync/block.block.olivero_miradorblock_2.yml @@ -0,0 +1,29 @@ +uuid: b1c03eb9-3cee-4d2e-893b-4d24940d9556 +langcode: en +status: true +dependencies: + module: + - islandora + - islandora_mirador + theme: + - olivero +id: olivero_miradorblock_2 +theme: olivero +region: repository_item_media_viewers +weight: 0 +provider: null +plugin: mirador_block +settings: + id: mirador_block + label: 'Mirador block - Single image items' + label_display: '0' + provider: islandora_mirador + iiif_manifest_url: '/node/[node:nid]/manifest' +visibility: + node_has_term: + id: node_has_term + negate: false + context_mapping: + node: '@node.node_route_context:node' + uri: 'https://projectmirador.org' + logic: and diff --git a/config/sync/block.block.olivero_publisher.yml b/config/sync/block.block.olivero_publisher.yml index b107146a..5d0bb424 100644 --- a/config/sync/block.block.olivero_publisher.yml +++ b/config/sync/block.block.olivero_publisher.yml @@ -7,7 +7,6 @@ dependencies: module: - context - facets - - islandora theme: - olivero id: olivero_publisher @@ -29,8 +28,3 @@ visibility: negate: false view_inclusion: view-solr_search_content-page_1: view-solr_search_content-page_1 - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' diff --git a/config/sync/block.block.olivero_publisherswc.yml b/config/sync/block.block.olivero_publisherswc.yml index 95ed6b21..c02902db 100644 --- a/config/sync/block.block.olivero_publisherswc.yml +++ b/config/sync/block.block.olivero_publisherswc.yml @@ -5,14 +5,12 @@ dependencies: config: - facets.facet.publisher_swc module: - - context - facets - - islandora theme: - olivero id: olivero_publisherswc theme: olivero -region: sidebar +region: collection_sidebar_region weight: -10 provider: null plugin: 'facet_block:publisher_swc' @@ -23,13 +21,4 @@ settings: provider: facets context_mapping: { } block_id: olivero_publisherswc -visibility: - context_all: - id: context_all - negate: false - values: collection - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' +visibility: { } diff --git a/config/sync/block.block.olivero_repositoryitemmediaviewers.yml b/config/sync/block.block.olivero_repositoryitemmediaviewers.yml new file mode 100644 index 00000000..25f3ac9c --- /dev/null +++ b/config/sync/block.block.olivero_repositoryitemmediaviewers.yml @@ -0,0 +1,28 @@ +uuid: 4cf81e2a-ab9a-43dd-a7e5-713aeba81cf3 +langcode: en +status: true +dependencies: + config: + - blockgroup.block_group_content.repository_item_media_viewers + module: + - blockgroup + - islandora + theme: + - olivero +id: olivero_repositoryitemmediaviewers +theme: olivero +region: content_above +weight: 0 +provider: null +plugin: 'block_group:repository_item_media_viewers' +settings: + id: 'block_group:repository_item_media_viewers' + label: 'Repository Item Media Viewers' + label_display: '0' + provider: blockgroup +visibility: + node_is_islandora_object: + id: node_is_islandora_object + negate: 0 + context_mapping: + node: '@node.node_route_context:node' diff --git a/config/sync/block.block.olivero_views_block__media_display_blocks_openseadragon.yml b/config/sync/block.block.olivero_views_block__media_display_blocks_openseadragon.yml new file mode 100644 index 00000000..3193358e --- /dev/null +++ b/config/sync/block.block.olivero_views_block__media_display_blocks_openseadragon.yml @@ -0,0 +1,33 @@ +uuid: 5d33c19f-57a7-4897-b9e7-82862907ca3f +langcode: en +status: true +dependencies: + config: + - views.view.media_display_blocks + module: + - islandora + - views + theme: + - olivero +id: olivero_views_block__media_display_blocks_openseadragon +theme: olivero +region: repository_item_media_viewers +weight: 0 +provider: null +plugin: 'views_block:media_display_blocks-openseadragon' +settings: + id: 'views_block:media_display_blocks-openseadragon' + label: '' + label_display: '0' + provider: views + context_mapping: { } + views_label: '' + items_per_page: none +visibility: + node_has_term: + id: node_has_term + negate: false + context_mapping: + node: '@node.node_route_context:node' + uri: 'http://openseadragon.github.io' + logic: and diff --git a/config/sync/block.block.olivero_views_block__media_display_blocks_pdfjs.yml b/config/sync/block.block.olivero_views_block__media_display_blocks_pdfjs.yml new file mode 100644 index 00000000..654f4679 --- /dev/null +++ b/config/sync/block.block.olivero_views_block__media_display_blocks_pdfjs.yml @@ -0,0 +1,33 @@ +uuid: 41c4db14-1939-4484-b99a-4d06dd7869fc +langcode: en +status: true +dependencies: + config: + - views.view.media_display_blocks + module: + - islandora + - views + theme: + - olivero +id: olivero_views_block__media_display_blocks_pdfjs +theme: olivero +region: repository_item_media_viewers +weight: 0 +provider: null +plugin: 'views_block:media_display_blocks-pdfjs' +settings: + id: 'views_block:media_display_blocks-pdfjs' + label: '' + label_display: '0' + provider: views + context_mapping: { } + views_label: '' + items_per_page: none +visibility: + node_has_term: + id: node_has_term + negate: false + context_mapping: + node: '@node.node_route_context:node' + uri: 'http://mozilla.github.io/pdf.js' + logic: and diff --git a/config/sync/block.block.olivero_views_block__media_display_blocks_source.yml b/config/sync/block.block.olivero_views_block__media_display_blocks_source.yml new file mode 100644 index 00000000..0e359ff8 --- /dev/null +++ b/config/sync/block.block.olivero_views_block__media_display_blocks_source.yml @@ -0,0 +1,33 @@ +uuid: 44c518c5-d8d7-4df3-9cce-460b09f85f23 +langcode: en +status: true +dependencies: + config: + - views.view.media_display_blocks + module: + - islandora + - views + theme: + - olivero +id: olivero_views_block__media_display_blocks_source +theme: olivero +region: repository_item_media_viewers +weight: 0 +provider: null +plugin: 'views_block:media_display_blocks-source' +settings: + id: 'views_block:media_display_blocks-source' + label: '' + label_display: '0' + provider: views + context_mapping: { } + views_label: '' + items_per_page: none +visibility: + node_has_term: + id: node_has_term + negate: true + context_mapping: + node: '@node.node_route_context:node' + uri: 'https://projectmirador.org,http://openseadragon.github.io,http://mozilla.github.io/pdf.js' + logic: or diff --git a/config/sync/block.block.olivero_views_block__newspaper_issues_accordion_view_block_1.yml b/config/sync/block.block.olivero_views_block__newspaper_issues_accordion_view_block_1.yml new file mode 100644 index 00000000..cbf881e1 --- /dev/null +++ b/config/sync/block.block.olivero_views_block__newspaper_issues_accordion_view_block_1.yml @@ -0,0 +1,33 @@ +uuid: 79a4e792-2232-4860-b4e4-0ee00b5b7044 +langcode: en +status: true +dependencies: + config: + - views.view.newspaper_issues_accordion_view + module: + - islandora + - views + theme: + - olivero +id: olivero_views_block__newspaper_issues_accordion_view_block_1 +theme: olivero +region: repository_item_media_viewers +weight: 0 +provider: null +plugin: 'views_block:newspaper_issues_accordion_view-block_1' +settings: + id: 'views_block:newspaper_issues_accordion_view-block_1' + label: '' + label_display: '0' + provider: views + context_mapping: { } + views_label: '' + items_per_page: none +visibility: + node_has_term: + id: node_has_term + negate: false + context_mapping: + node: '@node.node_route_context:node' + uri: 'https://schema.org/Newspaper' + logic: and diff --git a/config/sync/block.block.olivero_views_block__oai_pmh_item_links_block_1.yml b/config/sync/block.block.olivero_views_block__oai_pmh_item_links_block_1.yml new file mode 100644 index 00000000..5c7ae70d --- /dev/null +++ b/config/sync/block.block.olivero_views_block__oai_pmh_item_links_block_1.yml @@ -0,0 +1,38 @@ +uuid: 81607bed-95a8-4848-acd4-b97ff57cb7d8 +langcode: en +status: true +dependencies: + config: + - views.view.oai_pmh_item_links + module: + - islandora + - views + theme: + - olivero +id: olivero_views_block__oai_pmh_item_links_block_1 +theme: olivero +region: content +weight: -19 +provider: null +plugin: 'views_block:oai_pmh_item_links-block_1' +settings: + id: 'views_block:oai_pmh_item_links-block_1' + label: '' + label_display: '0' + provider: views + context_mapping: { } + views_label: '' + items_per_page: none +visibility: + node_has_term: + id: node_has_term + negate: true + context_mapping: + node: '@node.node_route_context:node' + uri: 'http://purl.org/dc/dcmitype/Collection' + logic: and + node_is_islandora_object: + id: node_is_islandora_object + negate: 0 + context_mapping: + node: '@node.node_route_context:node' diff --git a/config/sync/block.block.physicalform.yml b/config/sync/block.block.physicalform.yml index 6f5eb853..d44c0ea8 100644 --- a/config/sync/block.block.physicalform.yml +++ b/config/sync/block.block.physicalform.yml @@ -7,7 +7,6 @@ dependencies: module: - context - facets - - islandora theme: - olivero _core: @@ -42,8 +41,3 @@ visibility: negate: false view_inclusion: view-solr_search_content-page_1: view-solr_search_content-page_1 - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' diff --git a/config/sync/block.block.physicalformswc.yml b/config/sync/block.block.physicalformswc.yml index 5a8d22de..6a2c4c7e 100644 --- a/config/sync/block.block.physicalformswc.yml +++ b/config/sync/block.block.physicalformswc.yml @@ -5,14 +5,12 @@ dependencies: config: - facets.facet.physical_form_swc module: - - context - facets - - islandora theme: - olivero id: physicalformswc theme: olivero -region: sidebar +region: collection_sidebar_region weight: -8 provider: null plugin: 'facet_block:physical_form_swc' @@ -23,24 +21,4 @@ settings: provider: facets context_mapping: { } block_id: physicalformswc -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' +visibility: { } diff --git a/config/sync/block.block.resource_type_swc.yml b/config/sync/block.block.resource_type_swc.yml index 4e7e7903..b1f40e86 100644 --- a/config/sync/block.block.resource_type_swc.yml +++ b/config/sync/block.block.resource_type_swc.yml @@ -5,14 +5,12 @@ dependencies: config: - facets.facet.resource_type_swc module: - - context - facets - - islandora theme: - olivero id: resource_type_swc theme: olivero -region: sidebar +region: collection_sidebar_region weight: -15 provider: null plugin: 'facet_block:resource_type_swc' @@ -23,24 +21,4 @@ settings: provider: facets context_mapping: { } block_id: resource_type_swc -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' +visibility: { } diff --git a/config/sync/block.block.resourcetype.yml b/config/sync/block.block.resourcetype.yml index 7bb0f40b..2267eef2 100644 --- a/config/sync/block.block.resourcetype.yml +++ b/config/sync/block.block.resourcetype.yml @@ -7,7 +7,6 @@ dependencies: module: - context - facets - - islandora theme: - olivero id: resourcetype @@ -35,11 +34,6 @@ visibility: own_page_true: '0' field_value: '0' user_fields: uid - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' view_inclusion: id: view_inclusion negate: false diff --git a/config/sync/block.block.search.yml b/config/sync/block.block.search.yml index c9879013..b467849c 100644 --- a/config/sync/block.block.search.yml +++ b/config/sync/block.block.search.yml @@ -5,7 +5,6 @@ dependencies: module: - advanced_search - context - - islandora - system theme: - olivero @@ -37,11 +36,6 @@ visibility: own_page_true: '0' field_value: '0' user_fields: uid - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' request_path: id: request_path negate: true diff --git a/config/sync/block.block.solrsearchcontentadvancedsearchforblock.yml b/config/sync/block.block.solrsearchcontentadvancedsearchforblock.yml index d5c8a2aa..9ccdfac6 100644 --- a/config/sync/block.block.solrsearchcontentadvancedsearchforblock.yml +++ b/config/sync/block.block.solrsearchcontentadvancedsearchforblock.yml @@ -4,13 +4,11 @@ status: true dependencies: module: - advanced_search - - context - - islandora theme: - olivero id: solrsearchcontentadvancedsearchforblock theme: olivero -region: sidebar +region: collection_sidebar_region weight: -17 provider: null plugin: 'advanced_search_block:solr_search_content__block_1' @@ -25,13 +23,4 @@ settings: - linked_agent_name_fulltext - field_publisher_fulltext context_filter: field_member_of -visibility: - context_all: - id: context_all - negate: false - values: collection - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' +visibility: { } diff --git a/config/sync/block.block.solrsearchcontentadvancedsearchforpage.yml b/config/sync/block.block.solrsearchcontentadvancedsearchforpage.yml index c7c07bcc..d073a30f 100644 --- a/config/sync/block.block.solrsearchcontentadvancedsearchforpage.yml +++ b/config/sync/block.block.solrsearchcontentadvancedsearchforpage.yml @@ -5,7 +5,6 @@ dependencies: module: - advanced_search - context - - islandora theme: - olivero id: solrsearchcontentadvancedsearchforpage @@ -26,11 +25,6 @@ settings: - field_publisher_fulltext context_filter: null visibility: - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' view_inclusion: id: view_inclusion negate: false diff --git a/config/sync/block.block.solrsearchcontentsearchresultspagerforblock.yml b/config/sync/block.block.solrsearchcontentsearchresultspagerforblock.yml index 16889963..0010a61a 100644 --- a/config/sync/block.block.solrsearchcontentsearchresultspagerforblock.yml +++ b/config/sync/block.block.solrsearchcontentsearchresultspagerforblock.yml @@ -4,14 +4,12 @@ status: true dependencies: module: - advanced_search - - context - - islandora theme: - olivero id: solrsearchcontentsearchresultspagerforblock theme: olivero -region: content -weight: -10 +region: collection_content_region +weight: -18 provider: null plugin: 'advanced_search_result_pager:solr_search_content__block_1' settings: @@ -19,24 +17,4 @@ settings: label: 'Solr search content: Search Results Pager for Block' label_display: '0' provider: advanced_search -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' +visibility: { } diff --git a/config/sync/block.block.solrsearchcontentsearchresultspagerforpage.yml b/config/sync/block.block.solrsearchcontentsearchresultspagerforpage.yml index c93dfb10..d8d0de8f 100644 --- a/config/sync/block.block.solrsearchcontentsearchresultspagerforpage.yml +++ b/config/sync/block.block.solrsearchcontentsearchresultspagerforpage.yml @@ -5,13 +5,12 @@ dependencies: module: - advanced_search - context - - islandora theme: - olivero id: solrsearchcontentsearchresultspagerforpage theme: olivero region: content -weight: -12 +weight: -23 provider: null plugin: 'advanced_search_result_pager:solr_search_content__page_1' settings: @@ -36,8 +35,3 @@ visibility: negate: false view_inclusion: view-solr_search_content-page_1: view-solr_search_content-page_1 - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' diff --git a/config/sync/block.block.subject.yml b/config/sync/block.block.subject.yml index 69e1fc52..30a19126 100644 --- a/config/sync/block.block.subject.yml +++ b/config/sync/block.block.subject.yml @@ -7,7 +7,6 @@ dependencies: module: - context - facets - - islandora theme: - olivero _core: @@ -42,8 +41,3 @@ visibility: negate: false view_inclusion: view-solr_search_content-page_1: view-solr_search_content-page_1 - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' diff --git a/config/sync/block.block.subjectname.yml b/config/sync/block.block.subjectname.yml index c683c649..2e13d7d1 100644 --- a/config/sync/block.block.subjectname.yml +++ b/config/sync/block.block.subjectname.yml @@ -7,7 +7,6 @@ dependencies: module: - context - facets - - islandora theme: - olivero _core: @@ -42,8 +41,3 @@ visibility: negate: false view_inclusion: view-solr_search_content-page_1: view-solr_search_content-page_1 - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' diff --git a/config/sync/block.block.subjectnamesswc.yml b/config/sync/block.block.subjectnamesswc.yml index 5bf8b8a4..c0f85392 100644 --- a/config/sync/block.block.subjectnamesswc.yml +++ b/config/sync/block.block.subjectnamesswc.yml @@ -5,14 +5,12 @@ dependencies: config: - facets.facet.subject_names_swc module: - - context - facets - - islandora theme: - olivero id: subjectnamesswc theme: olivero -region: sidebar +region: collection_sidebar_region weight: -4 provider: null plugin: 'facet_block:subject_names_swc' @@ -23,24 +21,4 @@ settings: provider: facets context_mapping: { } block_id: subjectnamesswc -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' +visibility: { } diff --git a/config/sync/block.block.subjectsswc.yml b/config/sync/block.block.subjectsswc.yml index 57c43a81..07a0aa73 100644 --- a/config/sync/block.block.subjectsswc.yml +++ b/config/sync/block.block.subjectsswc.yml @@ -5,14 +5,12 @@ dependencies: config: - facets.facet.subjects module: - - context - facets - - islandora theme: - olivero id: subjectsswc theme: olivero -region: sidebar +region: collection_sidebar_region weight: -6 provider: null plugin: 'facet_block:subjects' @@ -23,24 +21,4 @@ settings: provider: facets context_mapping: { } block_id: subjectsswc -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' +visibility: { } diff --git a/config/sync/block.block.subjecttemporalswc.yml b/config/sync/block.block.subjecttemporalswc.yml index c7d09162..8d774c87 100644 --- a/config/sync/block.block.subjecttemporalswc.yml +++ b/config/sync/block.block.subjecttemporalswc.yml @@ -5,14 +5,12 @@ dependencies: config: - facets.facet.subject_temporal_swc module: - - context - facets - - islandora theme: - olivero id: subjecttemporalswc theme: olivero -region: sidebar +region: collection_sidebar_region weight: -2 provider: null plugin: 'facet_block:subject_temporal_swc' @@ -23,24 +21,4 @@ settings: provider: facets context_mapping: { } block_id: subjecttemporalswc -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' +visibility: { } diff --git a/config/sync/block.block.temporalsubject.yml b/config/sync/block.block.temporalsubject.yml index a9c8d110..0f085423 100644 --- a/config/sync/block.block.temporalsubject.yml +++ b/config/sync/block.block.temporalsubject.yml @@ -7,7 +7,6 @@ dependencies: module: - context - facets - - islandora theme: - olivero _core: @@ -42,8 +41,3 @@ visibility: negate: false view_inclusion: view-solr_search_content-page_1: view-solr_search_content-page_1 - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' diff --git a/config/sync/block.block.views_block__solr_search_content_block_1.yml b/config/sync/block.block.views_block__solr_search_content_block_1.yml index 26d14efd..27c98039 100644 --- a/config/sync/block.block.views_block__solr_search_content_block_1.yml +++ b/config/sync/block.block.views_block__solr_search_content_block_1.yml @@ -5,15 +5,13 @@ dependencies: config: - views.view.solr_search_content module: - - context - - islandora - views theme: - olivero id: views_block__solr_search_content_block_1 theme: olivero -region: content -weight: -9 +region: collection_content_region +weight: -17 provider: null plugin: 'views_block:solr_search_content-block_1' settings: @@ -23,24 +21,4 @@ settings: provider: views views_label: '' items_per_page: none -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' +visibility: { } diff --git a/config/sync/block.block.year.yml b/config/sync/block.block.year.yml index d7c8b3e8..e61bc059 100644 --- a/config/sync/block.block.year.yml +++ b/config/sync/block.block.year.yml @@ -7,7 +7,6 @@ dependencies: module: - context - facets - - islandora theme: - olivero id: year @@ -24,22 +23,6 @@ settings: context_mapping: { } block_id: year visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' view_inclusion: id: view_inclusion negate: false diff --git a/config/sync/block.block.yearswc.yml b/config/sync/block.block.yearswc.yml index 6b00103e..9f377982 100644 --- a/config/sync/block.block.yearswc.yml +++ b/config/sync/block.block.yearswc.yml @@ -5,14 +5,12 @@ dependencies: config: - facets.facet.year_swc module: - - context - facets - - islandora theme: - olivero id: yearswc theme: olivero -region: sidebar +region: collection_sidebar_region weight: 0 provider: null plugin: 'facet_block:year_swc' @@ -23,24 +21,4 @@ settings: provider: facets context_mapping: { } block_id: yearswc -visibility: - user_status: - id: user_status - negate: false - context_mapping: - user: '@user.current_user_context:current_user' - user_status: - viewing_profile: '0' - logged_viewing_profile: '0' - own_page_true: '0' - field_value: '0' - user_fields: uid - context_all: - id: context_all - negate: null - values: collection - media_source_mimetype: - id: media_source_mimetype - negate: false - context_mapping: { } - mimetype: '' +visibility: { } diff --git a/config/sync/blockgroup.block_group_content.collection_content_region.yml b/config/sync/blockgroup.block_group_content.collection_content_region.yml new file mode 100644 index 00000000..44ce8cae --- /dev/null +++ b/config/sync/blockgroup.block_group_content.collection_content_region.yml @@ -0,0 +1,6 @@ +uuid: b03bf807-b0b1-4696-a3d6-de24d54462bd +langcode: en +status: true +dependencies: { } +id: collection_content_region +label: 'Collection (Content region)' diff --git a/config/sync/blockgroup.block_group_content.collection_sidebar_region.yml b/config/sync/blockgroup.block_group_content.collection_sidebar_region.yml new file mode 100644 index 00000000..fc05585e --- /dev/null +++ b/config/sync/blockgroup.block_group_content.collection_sidebar_region.yml @@ -0,0 +1,6 @@ +uuid: 64c82a81-5855-43d3-be73-4d4c6840f162 +langcode: en +status: true +dependencies: { } +id: collection_sidebar_region +label: 'Collection (Sidebar region)' diff --git a/config/sync/blockgroup.block_group_content.repository_item_media_viewers.yml b/config/sync/blockgroup.block_group_content.repository_item_media_viewers.yml new file mode 100644 index 00000000..39a6a0d2 --- /dev/null +++ b/config/sync/blockgroup.block_group_content.repository_item_media_viewers.yml @@ -0,0 +1,6 @@ +uuid: 15921769-e278-497f-baaa-65fa50c58d61 +langcode: en +status: true +dependencies: { } +id: repository_item_media_viewers +label: 'Repository Item Media Viewers' diff --git a/config/sync/context.context.citation_select_block.yml b/config/sync/context.context.citation_select_block.yml index ef4cb6d6..31ed150a 100644 --- a/config/sync/context.context.citation_select_block.yml +++ b/config/sync/context.context.citation_select_block.yml @@ -10,7 +10,7 @@ name: citation_select_block group: Display description: 'If an Islandora node, and not a Collection, show Citation Select Block' requireAllConditions: true -disabled: false +disabled: true conditions: node_is_islandora_object: id: node_is_islandora_object diff --git a/config/sync/context.context.collection.yml b/config/sync/context.context.collection.yml index f32de5ec..f9bedd4e 100644 --- a/config/sync/context.context.collection.yml +++ b/config/sync/context.context.collection.yml @@ -11,7 +11,7 @@ name: collection group: Display description: 'If a Collection or Compound, display a block of children' requireAllConditions: false -disabled: false +disabled: true conditions: node_has_term: id: node_has_term diff --git a/config/sync/context.context.default_media_display.yml b/config/sync/context.context.default_media_display.yml index a717cfde..7957ad92 100644 --- a/config/sync/context.context.default_media_display.yml +++ b/config/sync/context.context.default_media_display.yml @@ -12,7 +12,7 @@ name: default_media_display group: Display description: 'Displays the Service File or Original File in its "Source" view mode' requireAllConditions: true -disabled: false +disabled: true conditions: node_has_term: id: node_has_term diff --git a/config/sync/context.context.display_oai_pmh_item_links.yml b/config/sync/context.context.display_oai_pmh_item_links.yml index 5f75c3bd..4b511285 100644 --- a/config/sync/context.context.display_oai_pmh_item_links.yml +++ b/config/sync/context.context.display_oai_pmh_item_links.yml @@ -12,7 +12,7 @@ name: display_oai_pmh_item_links group: Display description: 'If an Islandora node, and not a Collection, show OAI-PMH Item Record Links (MODS, DC)' requireAllConditions: true -disabled: false +disabled: true conditions: node_has_term: id: node_has_term diff --git a/config/sync/context.context.mirador_block_multipaged_items.yml b/config/sync/context.context.mirador_block_multipaged_items.yml index a6903e5c..97dbf0c7 100644 --- a/config/sync/context.context.mirador_block_multipaged_items.yml +++ b/config/sync/context.context.mirador_block_multipaged_items.yml @@ -12,7 +12,7 @@ name: mirador_block_multipaged_items group: Display description: 'If Paged Content or Publication Issue, display Mirador from manifest.' requireAllConditions: false -disabled: false +disabled: true conditions: node_has_term: id: node_has_term diff --git a/config/sync/context.context.mirador_block_single_image_items.yml b/config/sync/context.context.mirador_block_single_image_items.yml index dd97e0d7..d238210f 100644 --- a/config/sync/context.context.mirador_block_single_image_items.yml +++ b/config/sync/context.context.mirador_block_single_image_items.yml @@ -12,7 +12,7 @@ name: mirador_block_single_image_items group: Display description: 'Display an image in the Mirador viewer.' requireAllConditions: false -disabled: false +disabled: true conditions: node_has_term: id: node_has_term diff --git a/config/sync/context.context.newspaper.yml b/config/sync/context.context.newspaper.yml index c9b00b20..c52d4838 100644 --- a/config/sync/context.context.newspaper.yml +++ b/config/sync/context.context.newspaper.yml @@ -12,7 +12,7 @@ name: newspaper group: Display description: "If a Newspaper, display the newspaper's children (issues) by date." requireAllConditions: false -disabled: false +disabled: true conditions: node_has_term: id: node_has_term diff --git a/config/sync/context.context.openseadragon_single_page_.yml b/config/sync/context.context.openseadragon_single_page_.yml index f22b4c1c..97ead460 100644 --- a/config/sync/context.context.openseadragon_single_page_.yml +++ b/config/sync/context.context.openseadragon_single_page_.yml @@ -12,7 +12,7 @@ name: openseadragon_single_page_ group: Display description: 'Displays the Service File or Original File in the OpenSeadragon view mode' requireAllConditions: true -disabled: false +disabled: true conditions: node_has_term: id: node_has_term diff --git a/config/sync/context.context.pdfjs.yml b/config/sync/context.context.pdfjs.yml index 06258967..9d1f19d9 100644 --- a/config/sync/context.context.pdfjs.yml +++ b/config/sync/context.context.pdfjs.yml @@ -12,7 +12,7 @@ name: pdfjs group: Display description: 'Displays the Service File or Original File in PDF.js view mode' requireAllConditions: false -disabled: false +disabled: true conditions: node_has_term: id: node_has_term diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index ac4d86f8..197cc512 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -12,6 +12,7 @@ module: big_pipe: 0 block: 0 block_content: 0 + blockgroup: 0 breakpoint: 0 citation_select: 0 ckeditor5: 0