Address field_access_terms tickets and a few minor things (#178)

* Makes member_of field a single value field. * Updates tests to handle a single member_of field. * Makes field_access_terms a public field (for now) * Moves "field_access_terms" out of the default display for repository item and collection object
jhu-idc · Jul 16, 2021 · 22af025 · 22af025
1 parent 9cd3d81
commit 22af025
Show file tree

Hide file tree

Showing 53 changed files with 314 additions and 119 deletions.
diff --git a/.env b/.env
@@ -73,7 +73,7 @@ REPOSITORY=ghcr.io/jhu-sheridan-libraries/idc-isle-dc
 TAG=upstream-20200824-f8d1e8e-27-g6cd914d
 
 # Docker image and tag for snapshot image
-SNAPSHOT_TAG=upstream-20201007-739693ae-314-gcd7a706.1623675453
+SNAPSHOT_TAG=upstream-20201007-739693ae-334-g9cd3d81.1625231210
 
 # IdP, SP entity URIs and base URLs
 SP_BASEURL=https://islandora-idc.traefik.me

diff --git a/codebase/config/sync/core.entity_view_display.node.collection_object.default.yml b/codebase/config/sync/core.entity_view_display.node.collection_object.default.yml
@@ -35,14 +35,6 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-  field_access_terms:
-    weight: 102
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    type: entity_reference_label
-    region: content
   field_alternative_title:
     type: reference_value_formatter
     weight: 6
@@ -53,7 +45,7 @@ content:
       invalid_reference_label: ''
     third_party_settings: {  }
   field_citable_url:
-    weight: 12
+    weight: 11
     label: above
     settings:
       trim_length: 80
@@ -65,7 +57,7 @@ content:
     type: link
     region: content
   field_collection_contact_email:
-    weight: 17
+    weight: 15
     label: above
     settings: {  }
     third_party_settings: {  }
@@ -80,7 +72,7 @@ content:
     type: string
     region: content
   field_collection_number:
-    weight: 10
+    weight: 9
     label: above
     settings:
       link_to_entity: false
@@ -97,7 +89,7 @@ content:
       invalid_reference_label: ''
     third_party_settings: {  }
   field_featured_item:
-    weight: 13
+    weight: 12
     label: above
     settings:
       format: default
@@ -107,7 +99,7 @@ content:
     type: boolean
     region: content
   field_finding_aid:
-    weight: 11
+    weight: 10
     label: above
     settings:
       trim_length: 80
@@ -119,15 +111,15 @@ content:
     type: link
     region: content
   field_member_of:
-    weight: 14
+    weight: 13
     label: above
     settings:
       link: true
     third_party_settings: {  }
     type: entity_reference_label
     region: content
   field_model:
-    weight: 101
+    weight: 17
     label: above
     settings:
       link: true
@@ -143,17 +135,17 @@ content:
     type: entity_reference_label
     region: content
   islandora_fits_checksum:
-    weight: 100
+    weight: 16
+    region: content
     settings: {  }
     third_party_settings: {  }
-    region: content
   links:
     weight: 4
     region: content
     settings: {  }
     third_party_settings: {  }
   openseadragon_media_evas_entity_view_1:
-    weight: 15
+    weight: 14
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -170,6 +162,7 @@ content:
 hidden:
   display_media_entity_view_2: true
   display_media_thumbnail: true
+  field_access_terms: true
   langcode: true
   openseadragon_media_evas_entity_view_2: true
   pdfjs_media_evas_entity_view_1: true

diff --git a/codebase/config/sync/core.entity_view_display.node.islandora_object.default.yml b/codebase/config/sync/core.entity_view_display.node.islandora_object.default.yml
@@ -85,14 +85,6 @@ content:
     third_party_settings: {  }
     type: entity_reference_label
     region: content
-  field_access_terms:
-    weight: 42
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    type: entity_reference_label
-    region: content
   field_alternative_title:
     weight: 3
     label: above
@@ -155,7 +147,7 @@ content:
     type: typed_relation_default
     region: content
   field_custodial_history:
-    weight: 43
+    weight: 42
     label: above
     settings:
       display_invalid_reference: 1
@@ -460,6 +452,7 @@ hidden:
   display_media_entity_view_1: true
   display_media_entity_view_2: true
   display_media_thumbnail: true
+  field_access_terms: true
   field_display_hints: true
   field_gemini_uri: true
   field_model: true

diff --git a/codebase/config/sync/field.field.media.audio.field_access_terms.yml b/codebase/config/sync/field.field.media.audio.field_access_terms.yml
@@ -6,6 +6,12 @@ dependencies:
     - field.storage.media.field_access_terms
     - media.type.audio
     - taxonomy.vocabulary.islandora_access
+  module:
+    - epp
+third_party_settings:
+  epp:
+    value: ''
+    on_update: 1
 _core:
   default_config_hash: zMylfN-fI9CYLY9HkVelF4387LDjMjcxAueAg6LVf8w
 id: media.audio.field_access_terms
@@ -14,7 +20,7 @@ entity_type: media
 bundle: audio
 label: 'Access terms'
 description: 'Terms that define who has access to view/edit this resource.'
-required: false
+required: true
 translatable: false
 default_value: {  }
 default_value_callback: ''

diff --git a/codebase/config/sync/field.field.media.document.field_access_terms.yml b/codebase/config/sync/field.field.media.document.field_access_terms.yml
@@ -6,6 +6,12 @@ dependencies:
     - field.storage.media.field_access_terms
     - media.type.document
     - taxonomy.vocabulary.islandora_access
+  module:
+    - epp
+third_party_settings:
+  epp:
+    value: ''
+    on_update: 1
 _core:
   default_config_hash: 7iLOcVFpCq9jtezHP8AeS8EG-Yk5EHQ0wsV7ygNYxeI
 id: media.document.field_access_terms
@@ -14,7 +20,7 @@ entity_type: media
 bundle: document
 label: 'Access terms'
 description: 'Terms that define who has access to view/edit this resource.'
-required: false
+required: true
 translatable: true
 default_value: {  }
 default_value_callback: ''

diff --git a/codebase/config/sync/field.field.media.extracted_text.field_access_terms.yml b/codebase/config/sync/field.field.media.extracted_text.field_access_terms.yml
@@ -6,13 +6,19 @@ dependencies:
     - field.storage.media.field_access_terms
     - media.type.extracted_text
     - taxonomy.vocabulary.islandora_access
+  module:
+    - epp
+third_party_settings:
+  epp:
+    value: ''
+    on_update: 1
 id: media.extracted_text.field_access_terms
 field_name: field_access_terms
 entity_type: media
 bundle: extracted_text
 label: 'Access terms'
 description: ''
-required: false
+required: true
 translatable: true
 default_value: {  }
 default_value_callback: ''

diff --git a/codebase/config/sync/field.field.media.file.field_access_terms.yml b/codebase/config/sync/field.field.media.file.field_access_terms.yml
@@ -6,6 +6,12 @@ dependencies:
     - field.storage.media.field_access_terms
     - media.type.file
     - taxonomy.vocabulary.islandora_access
+  module:
+    - epp
+third_party_settings:
+  epp:
+    value: ''
+    on_update: 1
 _core:
   default_config_hash: 4J_HfSex6RG0DqvYnL64GW2PPdCE9LTI_wcJbVBPTJA
 id: media.file.field_access_terms
@@ -14,7 +20,7 @@ entity_type: media
 bundle: file
 label: 'Access terms'
 description: 'Terms that define who has access to view/edit this resource.'
-required: false
+required: true
 translatable: true
 default_value: {  }
 default_value_callback: ''

diff --git a/codebase/config/sync/field.field.media.image.field_access_terms.yml b/codebase/config/sync/field.field.media.image.field_access_terms.yml
@@ -6,6 +6,12 @@ dependencies:
     - field.storage.media.field_access_terms
     - media.type.image
     - taxonomy.vocabulary.islandora_access
+  module:
+    - epp
+third_party_settings:
+  epp:
+    value: ''
+    on_update: 1
 _core:
   default_config_hash: '-lMjqsiKVP3LjspOgRdrckFRFXKfyOkqAnPAxuE7K5w'
 id: media.image.field_access_terms
@@ -14,7 +20,7 @@ entity_type: media
 bundle: image
 label: 'Access terms'
 description: 'Terms that define who has access to view/edit this resource.'
-required: false
+required: true
 translatable: false
 default_value: {  }
 default_value_callback: ''

diff --git a/codebase/config/sync/field.field.media.remote_video.field_access_terms.yml b/codebase/config/sync/field.field.media.remote_video.field_access_terms.yml
@@ -6,13 +6,19 @@ dependencies:
     - field.storage.media.field_access_terms
     - media.type.remote_video
     - taxonomy.vocabulary.islandora_access
+  module:
+    - epp
+third_party_settings:
+  epp:
+    value: ''
+    on_update: 1
 id: media.remote_video.field_access_terms
 field_name: field_access_terms
 entity_type: media
 bundle: remote_video
 label: 'Access terms'
 description: ''
-required: false
+required: true
 translatable: true
 default_value: {  }
 default_value_callback: ''

diff --git a/codebase/config/sync/field.field.media.video.field_access_terms.yml b/codebase/config/sync/field.field.media.video.field_access_terms.yml
@@ -6,6 +6,12 @@ dependencies:
     - field.storage.media.field_access_terms
     - media.type.video
     - taxonomy.vocabulary.islandora_access
+  module:
+    - epp
+third_party_settings:
+  epp:
+    value: ''
+    on_update: 1
 _core:
   default_config_hash: rQJGaUMqAT7XoaBgoFeFJfRfVOjxlPl9TuA_lcUdqy4
 id: media.video.field_access_terms
@@ -14,7 +20,7 @@ entity_type: media
 bundle: video
 label: 'Access terms'
 description: 'Terms that define who has access to view/edit this resource.'
-required: false
+required: true
 translatable: false
 default_value: {  }
 default_value_callback: ''

diff --git a/codebase/config/sync/field.field.node.collection_object.field_access_terms.yml b/codebase/config/sync/field.field.node.collection_object.field_access_terms.yml
@@ -18,7 +18,7 @@ entity_type: node
 bundle: collection_object
 label: 'Access Terms'
 description: ''
-required: false
+required: true
 translatable: false
 default_value: {  }
 default_value_callback: ''

diff --git a/codebase/config/sync/field.field.node.islandora_object.field_access_terms.yml b/codebase/config/sync/field.field.node.islandora_object.field_access_terms.yml
@@ -18,7 +18,7 @@ entity_type: node
 bundle: islandora_object
 label: 'Access Terms'
 description: ''
-required: false
+required: true
 translatable: true
 default_value: {  }
 default_value_callback: ''

diff --git a/codebase/config/sync/field.storage.media.field_access_terms.yml b/codebase/config/sync/field.storage.media.field_access_terms.yml
@@ -8,7 +8,7 @@ dependencies:
     - taxonomy
 third_party_settings:
   field_permissions:
-    permission_type: private
+    permission_type: public
 _core:
   default_config_hash: wJ27ZPLCi9CKnGI4gwKjMBuAAtXPgxaJoiecuALirdY
 id: media.field_access_terms

diff --git a/codebase/config/sync/field.storage.node.field_access_terms.yml b/codebase/config/sync/field.storage.node.field_access_terms.yml
@@ -8,7 +8,7 @@ dependencies:
     - taxonomy
 third_party_settings:
   field_permissions:
-    permission_type: custom
+    permission_type: public
 id: node.field_access_terms
 field_name: field_access_terms
 entity_type: node

diff --git a/codebase/config/sync/field.storage.node.field_member_of.yml b/codebase/config/sync/field.storage.node.field_member_of.yml
@@ -21,7 +21,7 @@ settings:
   target_type: node
 module: core
 locked: false
-cardinality: -1
+cardinality: 1
 translatable: true
 indexes: {  }
 persist_with_no_fields: false

diff --git a/codebase/config/sync/migrate_plus.migration.idc_ingest_contact_email.yml b/codebase/config/sync/migrate_plus.migration.idc_ingest_contact_email.yml
@@ -1,7 +1,8 @@
+uuid: 3c864df1-d3e1-470c-ae40-439268277ba6
 langcode: en
 status: true
 dependencies: {  }
-id: idc_ingest_new_contact_email
+id: idc_ingest_contact_email
 class: null
 field_plugin_method: null
 cck_plugin_method: null

diff --git a/codebase/config/sync/migrate_plus.migration.idc_ingest_media_audio.yml b/codebase/config/sync/migrate_plus.migration.idc_ingest_media_audio.yml
@@ -56,6 +56,21 @@ process:
     source:
       - constants/DRUPAL_FS
       - '@_destination_filepath'
+  field_access_terms:
+    -
+      plugin: skip_on_empty
+      method: process
+      source: access_terms
+    -
+      plugin: explode
+      delimiter: '|'
+      strict: false
+    -
+      plugin: entity_lookup
+      bundle_key: vid
+      bundle: islandora_access
+      entity_type: taxonomy_term
+      value_key: name
   field_original_name: original_name
   field_media_audio_file/target_id:
     plugin: file_import

diff --git a/codebase/config/sync/migrate_plus.migration.idc_ingest_media_document.yml b/codebase/config/sync/migrate_plus.migration.idc_ingest_media_document.yml
@@ -56,6 +56,21 @@ process:
     source:
       - constants/DRUPAL_FS
       - '@_destination_filepath'
+  field_access_terms:
+    -
+      plugin: skip_on_empty
+      method: process
+      source: access_terms
+    -
+      plugin: explode
+      delimiter: '|'
+      strict: false
+    -
+      plugin: entity_lookup
+      bundle_key: vid
+      bundle: islandora_access
+      entity_type: taxonomy_term
+      value_key: name
   field_original_name: original_name
   field_media_document/target_id:
     plugin: file_import