From 8f192752a3eaa003dc81d7ab0b1515f642d2f17c Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Tue, 11 Jul 2023 17:53:29 +0000 Subject: [PATCH 1/2] Change Rights to formatted text. --- ..._display.node.islandora_object.default.yml | 6 +- ..._display.node.islandora_object.default.yml | 9 +- ...lay.node.islandora_object.search_index.yml | 85 +++++++++---------- ...eld.node.islandora_object.field_rights.yml | 8 +- .../sync/field.storage.node.field_rights.yml | 20 ++--- .../search_api.index.default_solr_index.yml | 8 +- .../search_api.server.default_solr_server.yml | 2 +- config/sync/views.view.oai_pmh_item_data.yml | 13 ++- 8 files changed, 77 insertions(+), 74 deletions(-) diff --git a/config/sync/core.entity_form_display.node.islandora_object.default.yml b/config/sync/core.entity_form_display.node.islandora_object.default.yml index cc91ab34b..222e43bc8 100644 --- a/config/sync/core.entity_form_display.node.islandora_object.default.yml +++ b/config/sync/core.entity_form_display.node.islandora_object.default.yml @@ -555,11 +555,11 @@ content: settings: { } third_party_settings: { } field_rights: - type: string_textfield - weight: 21 + type: text_textarea + weight: 44 region: content settings: - size: 60 + rows: 5 placeholder: '' third_party_settings: { } field_subject: diff --git a/config/sync/core.entity_view_display.node.islandora_object.default.yml b/config/sync/core.entity_view_display.node.islandora_object.default.yml index 06dfabfd4..9f9d5f90b 100644 --- a/config/sync/core.entity_view_display.node.islandora_object.default.yml +++ b/config/sync/core.entity_view_display.node.islandora_object.default.yml @@ -373,12 +373,11 @@ content: weight: 22 region: content field_rights: - type: string - label: inline - settings: - link_to_entity: false + type: text_default + label: above + settings: { } third_party_settings: { } - weight: 40 + weight: 44 region: content field_subject: type: entity_reference_label diff --git a/config/sync/core.entity_view_display.node.islandora_object.search_index.yml b/config/sync/core.entity_view_display.node.islandora_object.search_index.yml index 0aa32b397..6ac6379ee 100644 --- a/config/sync/core.entity_view_display.node.islandora_object.search_index.yml +++ b/config/sync/core.entity_view_display.node.islandora_object.search_index.yml @@ -86,7 +86,7 @@ content: label: above settings: { } third_party_settings: { } - weight: 19 + weight: 17 region: content field_alt_title: type: string @@ -94,7 +94,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 4 + weight: 2 region: content field_classification: type: string @@ -102,14 +102,14 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 36 + weight: 35 region: content field_coordinates: type: geolocation_latlng label: above settings: { } third_party_settings: { } - weight: 32 + weight: 31 region: content field_coordinates_text: type: string @@ -117,7 +117,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 33 + weight: 32 region: content field_copyright_date: type: edtf_default @@ -129,7 +129,7 @@ content: day_format: dd year_format: 'y' third_party_settings: { } - weight: 11 + weight: 9 region: content field_date_captured: type: edtf_default @@ -141,7 +141,7 @@ content: day_format: dd year_format: 'y' third_party_settings: { } - weight: 13 + weight: 11 region: content field_date_modified: type: edtf_default @@ -153,7 +153,7 @@ content: day_format: dd year_format: 'y' third_party_settings: { } - weight: 14 + weight: 12 region: content field_date_valid: type: edtf_default @@ -165,14 +165,14 @@ content: day_format: dd year_format: 'y' third_party_settings: { } - weight: 12 + weight: 10 region: content field_description: type: basic_string label: above settings: { } third_party_settings: { } - weight: 18 + weight: 16 region: content field_dewey_classification: type: string @@ -180,7 +180,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 34 + weight: 33 region: content field_edition: type: string @@ -188,7 +188,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 15 + weight: 13 region: content field_edtf_date: type: edtf_default @@ -200,7 +200,7 @@ content: day_format: dd year_format: 'y' third_party_settings: { } - weight: 9 + weight: 7 region: content field_edtf_date_created: type: edtf_default @@ -212,7 +212,7 @@ content: day_format: dd year_format: 'y' third_party_settings: { } - weight: 8 + weight: 6 region: content field_edtf_date_issued: type: edtf_default @@ -224,7 +224,7 @@ content: day_format: dd year_format: 'y' third_party_settings: { } - weight: 7 + weight: 5 region: content field_extent: type: string @@ -232,7 +232,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 26 + weight: 24 region: content field_frequency: type: entity_reference_label @@ -240,7 +240,7 @@ content: settings: link: true third_party_settings: { } - weight: 17 + weight: 15 region: content field_full_title: type: basic_string @@ -252,7 +252,7 @@ content: field_gemini_uri: settings: { } third_party_settings: { } - weight: 42 + weight: 40 region: content field_genre: type: entity_reference_label @@ -260,7 +260,7 @@ content: settings: link: true third_party_settings: { } - weight: 24 + weight: 22 region: content field_geographic_subject: type: entity_reference_label @@ -268,7 +268,7 @@ content: settings: link: true third_party_settings: { } - weight: 29 + weight: 28 region: content field_identifier: type: string @@ -276,7 +276,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 37 + weight: 36 region: content field_isbn: type: string @@ -284,7 +284,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 38 + weight: 37 region: content field_language: type: entity_reference_label @@ -292,7 +292,7 @@ content: settings: link: true third_party_settings: { } - weight: 22 + weight: 20 region: content field_lcc_classification: type: string @@ -300,7 +300,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 35 + weight: 34 region: content field_linked_agent: type: typed_relation_default @@ -308,7 +308,7 @@ content: settings: link: true third_party_settings: { } - weight: 5 + weight: 3 region: content field_local_identifier: type: string @@ -316,7 +316,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 40 + weight: 39 region: content field_member_of: type: entity_reference_label @@ -324,7 +324,7 @@ content: settings: link: true third_party_settings: { } - weight: 3 + weight: 1 region: content field_mode_of_issuance: type: entity_reference_label @@ -332,14 +332,14 @@ content: settings: link: true third_party_settings: { } - weight: 16 + weight: 14 region: content field_note: type: text_default label: above settings: { } third_party_settings: { } - weight: 21 + weight: 19 region: content field_oclc_number: type: string @@ -347,7 +347,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 39 + weight: 38 region: content field_physical_form: type: entity_reference_label @@ -355,7 +355,7 @@ content: settings: link: true third_party_settings: { } - weight: 25 + weight: 23 region: content field_place_published: type: string @@ -363,7 +363,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 6 + weight: 4 region: content field_resource_type: type: entity_reference_label @@ -371,15 +371,14 @@ content: settings: link: true third_party_settings: { } - weight: 23 + weight: 21 region: content field_rights: - type: string + type: text_default label: above - settings: - link_to_entity: false + settings: { } third_party_settings: { } - weight: 41 + weight: 25 region: content field_subject: type: entity_reference_label @@ -387,7 +386,7 @@ content: settings: link: true third_party_settings: { } - weight: 28 + weight: 27 region: content field_subject_general: type: entity_reference_label @@ -395,7 +394,7 @@ content: settings: link: true third_party_settings: { } - weight: 27 + weight: 26 region: content field_subjects_name: type: entity_reference_label @@ -403,14 +402,14 @@ content: settings: link: true third_party_settings: { } - weight: 30 + weight: 29 region: content field_table_of_contents: type: text_default label: above settings: { } third_party_settings: { } - weight: 20 + weight: 18 region: content field_temporal_subject: type: entity_reference_label @@ -418,12 +417,12 @@ content: settings: link: true third_party_settings: { } - weight: 31 + weight: 30 region: content links: settings: { } third_party_settings: { } - weight: 10 + weight: 8 region: content hidden: display_media_entity_view_3: true diff --git a/config/sync/field.field.node.islandora_object.field_rights.yml b/config/sync/field.field.node.islandora_object.field_rights.yml index 0b6814351..f4dd7957a 100644 --- a/config/sync/field.field.node.islandora_object.field_rights.yml +++ b/config/sync/field.field.node.islandora_object.field_rights.yml @@ -1,12 +1,12 @@ -uuid: 4cc2749c-e1fd-4ddc-b38f-2b5bbbfdc26f +uuid: 57d89f5b-89bb-4a83-b042-2da5f3ddd57f langcode: en status: true dependencies: config: - field.storage.node.field_rights - node.type.islandora_object -_core: - default_config_hash: TcLlBpkyrOqvKlsv2FWofgGorwanfxuIAPmtNJbnDFw + module: + - text id: node.islandora_object.field_rights field_name: field_rights entity_type: node @@ -18,4 +18,4 @@ translatable: true default_value: { } default_value_callback: '' settings: { } -field_type: string +field_type: text_long diff --git a/config/sync/field.storage.node.field_rights.yml b/config/sync/field.storage.node.field_rights.yml index f2e21849e..11624c701 100644 --- a/config/sync/field.storage.node.field_rights.yml +++ b/config/sync/field.storage.node.field_rights.yml @@ -1,22 +1,22 @@ -uuid: e8e0e132-853e-41f0-bc0d-6398ed849bf9 +uuid: 27325890-7d5f-43c9-bc60-32e2564caae7 langcode: en status: true dependencies: module: + - field_permissions - node -_core: - default_config_hash: AxYVFhXak_aXJbnP3Jul57QR05OeP6rByH5DTxc4M3I + - text +third_party_settings: + field_permissions: + permission_type: public id: node.field_rights field_name: field_rights entity_type: node -type: string -settings: - max_length: 1000 - case_sensitive: false - is_ascii: false -module: core +type: text_long +settings: { } +module: text locked: false -cardinality: -1 +cardinality: 1 translatable: true indexes: { } persist_with_no_fields: false diff --git a/config/sync/search_api.index.default_solr_index.yml b/config/sync/search_api.index.default_solr_index.yml index 4a65fec75..2f5174943 100644 --- a/config/sync/search_api.index.default_solr_index.yml +++ b/config/sync/search_api.index.default_solr_index.yml @@ -3,12 +3,13 @@ langcode: en status: true dependencies: config: + - field.storage.node.field_abstract - field.storage.node.field_alt_title + - field.storage.node.field_edtf_date_created - field.storage.node.field_member_of - field.storage.node.field_description - field.storage.node.field_dewey_classification - field.storage.node.field_edition - - field.storage.node.field_edtf_date_created - field.storage.node.field_extent - field.storage.node.field_full_title - field.storage.node.field_isbn @@ -18,13 +19,12 @@ dependencies: - field.storage.node.field_physical_form - field.storage.node.field_resource_type - field.storage.node.field_rights - - field.storage.node.field_tags - - field.storage.node.field_abstract - field.storage.node.field_subject_general - field.storage.node.field_geographic_subject - field.storage.node.field_subjects_name - field.storage.node.field_temporal_subject - field.storage.node.field_subject + - field.storage.node.field_tags - search_api.server.default_solr_server - core.entity_view_mode.node.search_index module: @@ -238,7 +238,7 @@ field_settings: label: Rights datasource_id: 'entity:node' property_path: field_rights - type: string + type: text dependencies: config: - field.storage.node.field_rights diff --git a/config/sync/search_api.server.default_solr_server.yml b/config/sync/search_api.server.default_solr_server.yml index cf83dbe54..f2dcdeb83 100644 --- a/config/sync/search_api.server.default_solr_server.yml +++ b/config/sync/search_api.server.default_solr_server.yml @@ -43,7 +43,7 @@ backend_config: connector: standard connector_config: scheme: http - host: localhost + host: 127.0.0.1 port: 8983 path: / core: ISLANDORA diff --git a/config/sync/views.view.oai_pmh_item_data.yml b/config/sync/views.view.oai_pmh_item_data.yml index bbe6ceaec..3129c2241 100644 --- a/config/sync/views.view.oai_pmh_item_data.yml +++ b/config/sync/views.view.oai_pmh_item_data.yml @@ -12,6 +12,7 @@ dependencies: - field.storage.node.field_linked_agent - field.storage.node.field_local_identifier - field.storage.node.field_place_published + - field.storage.node.field_resource_type - field.storage.node.field_rights - field.storage.node.field_subject_general - field.storage.node.field_temporal_subject @@ -19,6 +20,7 @@ dependencies: module: - controlled_access_terms - search_api + - text id: oai_pmh_item_data label: 'OAI-PMH Item Data' module: views @@ -1461,7 +1463,7 @@ display: element_class: '' element_label_type: '' element_label_class: '' - element_label_colon: true + element_label_colon: false element_wrapper_type: '' element_wrapper_class: '' element_default_classes: true @@ -1470,9 +1472,8 @@ display: empty_zero: false hide_alter_empty: true click_sort_column: value - type: string - settings: - link_to_entity: false + type: text_default + settings: { } group_column: value group_columns: { } group_rows: true @@ -1632,10 +1633,12 @@ display: - 'config:field.storage.node.field_linked_agent' - 'config:field.storage.node.field_local_identifier' - 'config:field.storage.node.field_place_published' + - 'config:field.storage.node.field_resource_type' - 'config:field.storage.node.field_rights' - 'config:field.storage.node.field_subject_general' - 'config:field.storage.node.field_temporal_subject' - 'config:search_api.index.default_solr_index' + - 'search_api_list:default_solr_index' page_1: id: page_1 display_title: Page @@ -1673,7 +1676,9 @@ display: - 'config:field.storage.node.field_linked_agent' - 'config:field.storage.node.field_local_identifier' - 'config:field.storage.node.field_place_published' + - 'config:field.storage.node.field_resource_type' - 'config:field.storage.node.field_rights' - 'config:field.storage.node.field_subject_general' - 'config:field.storage.node.field_temporal_subject' - 'config:search_api.index.default_solr_index' + - 'search_api_list:default_solr_index' From 8f3de2c3f2be80895bc44a2eaf7abe0e7828f176 Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Thu, 13 Jul 2023 09:19:44 -0300 Subject: [PATCH 2/2] Change cardinality to unlimited. --- config/sync/field.storage.node.field_rights.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sync/field.storage.node.field_rights.yml b/config/sync/field.storage.node.field_rights.yml index 11624c701..5705fd425 100644 --- a/config/sync/field.storage.node.field_rights.yml +++ b/config/sync/field.storage.node.field_rights.yml @@ -16,7 +16,7 @@ type: text_long settings: { } module: text locked: false -cardinality: 1 +cardinality: -1 translatable: true indexes: { } persist_with_no_fields: false