diff --git a/.env b/.env index f6057c019..3ccf6cef4 100644 --- a/.env +++ b/.env @@ -69,7 +69,7 @@ REPOSITORY=ghcr.io/jhu-sheridan-libraries/idc-isle-dc TAG=upstream-20200824-f8d1e8e-23-g9fe79fc # Docker image and tag for snapshot image -SNAPSHOT_TAG=upstream-20201007-739693ae-226-gf12f7708.1617383406 +SNAPSHOT_TAG=upstream-20201007-739693ae-233-g5a043ef.1618257390 # IdP, SP entity URIs and base URLs SP_BASEURL=https://islandora-idc.traefik.me diff --git a/codebase/composer.lock b/codebase/composer.lock index e031103c3..a08bc13c4 100644 --- a/codebase/composer.lock +++ b/codebase/composer.lock @@ -6739,12 +6739,12 @@ "source": { "type": "git", "url": "https://github.com/jhu-idc/idc-ui-theme.git", - "reference": "fba85b02d512ff369183555f5c280a89334dd1a0" + "reference": "3e46bfa35f815ca4a16375911e0fa4b8818e710e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jhu-idc/idc-ui-theme/zipball/fba85b02d512ff369183555f5c280a89334dd1a0", - "reference": "fba85b02d512ff369183555f5c280a89334dd1a0", + "url": "https://api.github.com/repos/jhu-idc/idc-ui-theme/zipball/3e46bfa35f815ca4a16375911e0fa4b8818e710e", + "reference": "3e46bfa35f815ca4a16375911e0fa4b8818e710e", "shasum": "" }, "type": "drupal-theme", @@ -6753,7 +6753,7 @@ "source": "https://github.com/jhu-idc/idc-ui-theme/tree/develop", "issues": "https://github.com/jhu-idc/idc-ui-theme/issues" }, - "time": "2021-03-25T20:02:53+00:00" + "time": "2021-04-12T19:47:17+00:00" }, { "name": "jhu-idc/idc_ui_module", @@ -6761,12 +6761,12 @@ "source": { "type": "git", "url": "https://github.com/jhu-idc/idc_ui_module.git", - "reference": "9f2a63631d12b4e95659433ee5f48a0a4869492f" + "reference": "a554904de72e51b516fb7194c412fec51af47e54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jhu-idc/idc_ui_module/zipball/9f2a63631d12b4e95659433ee5f48a0a4869492f", - "reference": "9f2a63631d12b4e95659433ee5f48a0a4869492f", + "url": "https://api.github.com/repos/jhu-idc/idc_ui_module/zipball/a554904de72e51b516fb7194c412fec51af47e54", + "reference": "a554904de72e51b516fb7194c412fec51af47e54", "shasum": "" }, "type": "drupal-module", @@ -6775,7 +6775,7 @@ "source": "https://github.com/jhu-idc/idc_ui_module/tree/main", "issues": "https://github.com/jhu-idc/idc_ui_module/issues" }, - "time": "2021-03-19T15:21:23+00:00" + "time": "2021-04-12T19:29:48+00:00" }, { "name": "jhu-idc/islandora_defaults", diff --git a/codebase/config/sync/block.block.exposedformsolr_search_contentpage_1_2.yml b/codebase/config/sync/block.block.idcsearchblock.yml similarity index 62% rename from codebase/config/sync/block.block.exposedformsolr_search_contentpage_1_2.yml rename to codebase/config/sync/block.block.idcsearchblock.yml index da49575b6..457e9af0a 100644 --- a/codebase/config/sync/block.block.exposedformsolr_search_contentpage_1_2.yml +++ b/codebase/config/sync/block.block.idcsearchblock.yml @@ -1,27 +1,25 @@ -uuid: b5d69653-1f42-46f5-b24c-12a410e39af1 +uuid: 0f2debb1-46e4-4246-99cf-268089b1aede langcode: en status: true dependencies: - config: - - views.view.solr_search_content module: - context + - idc_ui_module - islandora - - views + - system theme: - idcui -id: exposedformsolr_search_contentpage_1_2 +id: idcsearchblock theme: idcui region: header_2 weight: 0 provider: null -plugin: 'views_exposed_filter_block:solr_search_content-page_1' +plugin: idc_search_block settings: - id: 'views_exposed_filter_block:solr_search_content-page_1' - label: '' - provider: views + id: idc_search_block + label: 'IDC Search Block' + provider: idc_ui_module label_display: '0' - views_label: '' visibility: view_inclusion: id: view_inclusion @@ -38,3 +36,8 @@ visibility: mimetype: '' negate: false context_mapping: { } + request_path: + id: request_path + pages: /search + negate: true + context_mapping: { } diff --git a/codebase/config/sync/migrate_plus.migration.idc_ingest_new_items.yml b/codebase/config/sync/migrate_plus.migration.idc_ingest_new_items.yml index c37458b3a..04728bb0a 100644 --- a/codebase/config/sync/migrate_plus.migration.idc_ingest_new_items.yml +++ b/codebase/config/sync/migrate_plus.migration.idc_ingest_new_items.yml @@ -1,7 +1,7 @@ uuid: 2c14b68f-1c0c-446e-99cf-bc2bbd0e346c langcode: en status: true -dependencies: { } +dependencies: { } id: idc_ingest_new_items class: null field_plugin_method: null @@ -17,116 +17,151 @@ source: process: title: title field_abstract: - - plugin: explode + - + plugin: explode source: abstract delimiter: '|' strict: false - - plugin: deepen - - plugin: sub_process + - + plugin: deepen + - + plugin: sub_process process: value: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: value - - plugin: explode - delimiter: ';' - - plugin: extract + - + plugin: explode + delimiter: ; + - + plugin: extract index: - 0 target_id: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: value - - plugin: explode - delimiter: ';' - - plugin: extract + - + plugin: explode + delimiter: ; + - + plugin: extract index: - 1 - - plugin: entity_lookup + - + plugin: entity_lookup entity_type: taxonomy_term bundle: language bundle_key: vid value_key: field_language_code field_access_rights: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: access_rights - - plugin: explode + - + plugin: explode delimiter: '|' strict: false - - plugin: entity_lookup + - + plugin: entity_lookup bundle_key: vid bundle: access_rights entity_type: taxonomy_term value_key: name - # TODO field_access_terms: field_alternative_title: - - plugin: explode + - + plugin: explode source: alt_title delimiter: '|' strict: false - - plugin: deepen - - plugin: sub_process + - + plugin: deepen + - + plugin: sub_process process: value: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: value - - plugin: explode - delimiter: ';' - - plugin: extract + - + plugin: explode + delimiter: ; + - + plugin: extract index: - 0 target_id: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: value - - plugin: explode - delimiter: ';' - - plugin: extract + - + plugin: explode + delimiter: ; + - + plugin: extract index: - 1 - - plugin: entity_lookup + - + plugin: entity_lookup entity_type: taxonomy_term bundle: language bundle_key: vid value_key: field_language_code field_collection_number: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: collection_number - - plugin: explode + - + plugin: explode delimiter: '|' strict: false field_contributor: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: contributor - - plugin: explode + - + plugin: explode delimiter: '|' strict: false - - plugin: deepen - - plugin: sub_process + - + plugin: deepen + - + plugin: sub_process process: rel_type: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: value - - plugin: explode - delimiter: ';' - - plugin: extract + - + plugin: explode + delimiter: ; + - + plugin: extract index: - 0 target_id: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: value - - plugin: explode - delimiter: ';' - - plugin: extract + - + plugin: explode + delimiter: ; + - + plugin: extract index: - 1 - - plugin: entity_lookup + - + plugin: entity_lookup entity_type: taxonomy_term bundle: person bundle_key: vid @@ -138,127 +173,161 @@ process: bundle: copyright_and_use bundle_key: vid value_key: name - # FIXME: test data references a Person and Corporate Body, only one can be resolved field_copyright_holder: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: copyright_holder - - plugin: explode + - + plugin: explode delimiter: '|' strict: false - - plugin: entity_lookup + - + plugin: entity_lookup entity_type: taxonomy_term bundle: person bundle_key: vid value_key: name field_creator: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: creator - - plugin: explode + - + plugin: explode delimiter: '|' strict: false - - plugin: deepen - - plugin: sub_process + - + plugin: deepen + - + plugin: sub_process process: rel_type: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: value - - plugin: explode - delimiter: ';' - - plugin: extract + - + plugin: explode + delimiter: ; + - + plugin: extract index: - 0 target_id: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: value - - plugin: explode - delimiter: ';' - - plugin: extract + - + plugin: explode + delimiter: ; + - + plugin: extract index: - 1 - - plugin: entity_lookup + - + plugin: entity_lookup entity_type: taxonomy_term bundle: person bundle_key: vid value_key: name field_date_available: date_available field_date_copyrighted: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: date_copyrighted - - plugin: explode + - + plugin: explode delimiter: '|' strict: false field_date_created: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: date_created - - plugin: explode + - + plugin: explode delimiter: '|' strict: false field_date_published: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: date_published - - plugin: explode + - + plugin: explode delimiter: '|' strict: false field_description: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: description - - plugin: explode + - + plugin: explode delimiter: '|' strict: false - - plugin: deepen - - plugin: sub_process + - + plugin: deepen + - + plugin: sub_process process: value: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: value - - plugin: explode - delimiter: ';' - - plugin: extract + - + plugin: explode + delimiter: ; + - + plugin: extract index: - 0 target_id: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: value - - plugin: explode - delimiter: ';' - - plugin: extract + - + plugin: explode + delimiter: ; + - + plugin: extract index: - 1 - - plugin: entity_lookup + - + plugin: entity_lookup entity_type: taxonomy_term bundle: language bundle_key: vid value_key: field_language_code field_digital_identifier: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: digital_identifier - - plugin: explode + - + plugin: explode delimiter: '|' strict: false field_digital_publisher: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: digital_publisher - - plugin: explode + - + plugin: explode delimiter: '|' strict: false - - plugin: entity_lookup + - + plugin: entity_lookup entity_type: taxonomy_term bundle: corporate_body bundle_key: vid value_key: name - # note: only available in JSON view field_display_hints: plugin: entity_lookup source: display_hints @@ -266,26 +335,29 @@ process: bundle: islandora_display entity_type: taxonomy_term value_key: name - # note: only available in JSON view field_dspace_identifier/uri: dspace_identifier - # note: only available in JSON view field_dspace_item_id: dspace_itemid field_extent: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: extent - - plugin: explode + - + plugin: explode delimiter: '|' strict: false field_finding_aid/uri: finding_aid field_genre: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: genre - - plugin: explode + - + plugin: explode delimiter: '|' strict: false - - plugin: entity_lookup + - + plugin: entity_lookup entity_type: taxonomy_term bundle: genre bundle_key: vid @@ -294,29 +366,34 @@ process: field_issn: issn field_is_part_of: is_part_of field_item_barcode: item_barcode - # note: only available in JSON view field_jhir/uri: jhir_uri field_language: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: language - - plugin: explode + - + plugin: explode delimiter: '|' strict: false - - plugin: entity_lookup + - + plugin: entity_lookup entity_type: taxonomy_term bundle: language bundle_key: vid value_key: name field_library_catalog_link/uri: library_catalog_link field_member_of: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: member_of - - plugin: explode + - + plugin: explode delimiter: '|' strict: false - - plugin: migration_lookup + - + plugin: migration_lookup migration: idc_ingest_new_collection no_stub: true field_model: @@ -327,119 +404,151 @@ process: value_key: name source: model field_oclc_number: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: oclc_number - - plugin: explode + - + plugin: explode delimiter: '|' strict: false field_publisher: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: publisher - - plugin: explode + - + plugin: explode delimiter: '|' strict: false - - plugin: entity_lookup + - + plugin: entity_lookup bundle_key: vid bundle: corporate_body entity_type: taxonomy_term value_key: name field_publisher_country: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: publisher_country - - plugin: explode + - + plugin: explode delimiter: '|' strict: false - - plugin: entity_lookup + - + plugin: entity_lookup bundle_key: vid bundle: geo_location entity_type: taxonomy_term value_key: name field_resource_type: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: resource_type - - plugin: explode + - + plugin: explode delimiter: '|' strict: false - - plugin: entity_lookup + - + plugin: entity_lookup bundle_key: vid bundle: resource_types entity_type: taxonomy_term value_key: name field_spatial_coverage: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: spatial_coverage - - plugin: explode + - + plugin: explode delimiter: '|' strict: false - - plugin: entity_lookup + - + plugin: entity_lookup bundle_key: vid bundle: geo_location entity_type: taxonomy_term value_key: name field_subject: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: subject - - plugin: explode + - + plugin: explode delimiter: '|' strict: false - - plugin: entity_lookup + - + plugin: entity_lookup bundle_key: vid bundle: subject entity_type: taxonomy_term value_key: name field_table_of_contents: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: table_of_contents - - plugin: explode + - + plugin: explode delimiter: '|' strict: false - - plugin: deepen - - plugin: sub_process + - + plugin: deepen + - + plugin: sub_process process: value: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: value - - plugin: explode - delimiter: ';' - - plugin: extract + - + plugin: explode + delimiter: ; + - + plugin: extract index: - 0 target_id: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: value - - plugin: explode - delimiter: ';' - - plugin: extract + - + plugin: explode + delimiter: ; + - + plugin: extract index: - 1 - - plugin: entity_lookup + - + plugin: entity_lookup entity_type: taxonomy_term bundle: language bundle_key: vid value_key: field_language_code field_title_language: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: title_language - - plugin: entity_lookup + - + plugin: entity_lookup entity_type: taxonomy_term bundle: language bundle_key: vid value_key: name field_years: - - plugin: skip_on_empty + - + plugin: skip_on_empty method: process source: years - - plugin: explode + - + plugin: explode delimiter: '|' strict: false destination: