Merge pull request #325 from jhu-idc/revert-320-pre-LAGS-129

Temp Solution Revert "Pre lags 129"
jhu-idc · Jun 17, 2022 · fa631d2 · fa631d2
2 parents 363b98b + 0746dc5
commit fa631d2
Show file tree

Hide file tree

Showing 16 changed files with 457 additions and 138 deletions.
diff --git a/codebase/composer.lock b/codebase/composer.lock
diff --git a/codebase/config/sync/core.entity_form_display.node.islandora_object.default.yml b/codebase/config/sync/core.entity_form_display.node.islandora_object.default.yml
@@ -41,20 +41,19 @@ dependencies:
     - field.field.node.islandora_object.field_publisher
     - field.field.node.islandora_object.field_publisher_country
     - field.field.node.islandora_object.field_resource_type
-    - field.field.node.islandora_object.field_sort_date
     - field.field.node.islandora_object.field_spatial_coverage
     - field.field.node.islandora_object.field_subject
     - field.field.node.islandora_object.field_table_of_contents
     - field.field.node.islandora_object.field_title_language
     - field.field.node.islandora_object.field_unique_id
     - field.field.node.islandora_object.field_weight
+    - field.field.node.islandora_object.field_years
     - node.type.islandora_object
   enforced:
     module:
       - islandora_defaults
   module:
     - controlled_access_terms
-    - datetime
     - field_group
     - link
     - reference_value_pair
@@ -113,7 +112,7 @@ third_party_settings:
         - field_date_created
         - field_date_published
         - field_date_copyrighted
-        - field_sort_date
+        - group_date_solr_year
       parent_name: ''
       weight: 2
       format_type: details
@@ -195,6 +194,20 @@ third_party_settings:
         classes: ''
         open: false
       label: Resources
+    group_date_solr_year:
+      children:
+        - field_years
+      parent_name: group_dates
+      weight: 46
+      format_type: details
+      region: content
+      format_settings:
+        id: ''
+        classes: ''
+        description: ''
+        open: false
+        required_fields: true
+      label: 'Date - Solr Year'
 _core:
   default_config_hash: HLvUbruUDjxBUB1PEtEQF7ZvGRY-87E68yLt78KBruM
 id: node.islandora_object.default
@@ -224,7 +237,7 @@ content:
     type: options_buttons
     region: content
   field_access_terms:
-    weight: 11
+    weight: 10
     settings: {  }
     third_party_settings: {  }
     type: options_select
@@ -364,20 +377,20 @@ content:
     region: content
   field_display_hints:
     type: options_buttons
-    weight: 12
+    weight: 11
     region: content
     settings: {  }
     third_party_settings: {  }
   field_dspace_identifier:
-    weight: 68
+    weight: 67
     settings:
       placeholder_url: ''
       placeholder_title: ''
     third_party_settings: {  }
     type: link_default
     region: content
   field_dspace_item_id:
-    weight: 69
+    weight: 68
     settings:
       size: 60
       placeholder: ''
@@ -477,7 +490,7 @@ content:
     region: content
   field_member_of:
     type: entity_reference_autocomplete
-    weight: 10
+    weight: 9
     region: content
     settings:
       match_operator: CONTAINS
@@ -544,12 +557,6 @@ content:
     third_party_settings: {  }
     type: options_buttons
     region: content
-  field_sort_date:
-    weight: 46
-    settings: {  }
-    third_party_settings: {  }
-    type: datetime_default
-    region: content
   field_spatial_coverage:
     weight: 24
     settings:
@@ -586,20 +593,29 @@ content:
     type: options_select
     region: content
   field_unique_id:
-    weight: 13
+    weight: 12
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
     type: string_textfield
     region: content
   field_weight:
-    weight: 14
+    weight: 13
     settings:
       placeholder: ''
     third_party_settings: {  }
     type: number
     region: content
+  field_years:
+    weight: 42
+    settings:
+      strict_dates: false
+      intervals: true
+      sets: false
+    third_party_settings: {  }
+    type: edtf_default
+    region: content
   status:
     type: boolean_checkbox
     settings:

diff --git a/codebase/config/sync/core.entity_view_display.node.islandora_object.binary.yml b/codebase/config/sync/core.entity_view_display.node.islandora_object.binary.yml
@@ -42,13 +42,13 @@ dependencies:
     - field.field.node.islandora_object.field_publisher
     - field.field.node.islandora_object.field_publisher_country
     - field.field.node.islandora_object.field_resource_type
-    - field.field.node.islandora_object.field_sort_date
     - field.field.node.islandora_object.field_spatial_coverage
     - field.field.node.islandora_object.field_subject
     - field.field.node.islandora_object.field_table_of_contents
     - field.field.node.islandora_object.field_title_language
     - field.field.node.islandora_object.field_unique_id
     - field.field.node.islandora_object.field_weight
+    - field.field.node.islandora_object.field_years
     - node.type.islandora_object
   enforced:
     module:
@@ -172,12 +172,12 @@ hidden:
   field_model: true
   field_publisher: true
   field_publisher_country: true
-  field_sort_date: true
   field_spatial_coverage: true
   field_table_of_contents: true
   field_title_language: true
   field_unique_id: true
   field_weight: true
+  field_years: true
   langcode: true
   openseadragon_media_evas_entity_view_1: true
   openseadragon_media_evas_entity_view_2: 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
@@ -41,20 +41,19 @@ dependencies:
     - field.field.node.islandora_object.field_publisher
     - field.field.node.islandora_object.field_publisher_country
     - field.field.node.islandora_object.field_resource_type
-    - field.field.node.islandora_object.field_sort_date
     - field.field.node.islandora_object.field_spatial_coverage
     - field.field.node.islandora_object.field_subject
     - field.field.node.islandora_object.field_table_of_contents
     - field.field.node.islandora_object.field_title_language
     - field.field.node.islandora_object.field_unique_id
     - field.field.node.islandora_object.field_weight
+    - field.field.node.islandora_object.field_years
     - node.type.islandora_object
   enforced:
     module:
       - islandora_defaults
   module:
     - controlled_access_terms
-    - datetime
     - link
     - reference_value_pair
     - user
@@ -396,15 +395,6 @@ content:
     third_party_settings: {  }
     type: entity_reference_label
     region: content
-  field_sort_date:
-    weight: 43
-    label: above
-    settings:
-      format_type: medium
-      timezone_override: ''
-    third_party_settings: {  }
-    type: datetime_default
-    region: content
   field_spatial_coverage:
     weight: 9
     label: above
@@ -438,6 +428,17 @@ content:
     third_party_settings: {  }
     type: entity_reference_label
     region: content
+  field_years:
+    weight: 22
+    label: above
+    settings:
+      date_separator: dash
+      date_order: big_endian
+      month_format: mm
+      day_format: dd
+    third_party_settings: {  }
+    type: edtf_default
+    region: content
   islandora_fits_checksum:
     weight: 10
     region: content

diff --git a/codebase/config/sync/core.entity_view_display.node.islandora_object.open_seadragon.yml b/codebase/config/sync/core.entity_view_display.node.islandora_object.open_seadragon.yml
@@ -42,13 +42,13 @@ dependencies:
     - field.field.node.islandora_object.field_publisher
     - field.field.node.islandora_object.field_publisher_country
     - field.field.node.islandora_object.field_resource_type
-    - field.field.node.islandora_object.field_sort_date
     - field.field.node.islandora_object.field_spatial_coverage
     - field.field.node.islandora_object.field_subject
     - field.field.node.islandora_object.field_table_of_contents
     - field.field.node.islandora_object.field_title_language
     - field.field.node.islandora_object.field_unique_id
     - field.field.node.islandora_object.field_weight
+    - field.field.node.islandora_object.field_years
     - node.type.islandora_object
   enforced:
     module:
@@ -405,6 +405,17 @@ content:
     settings:
       link: true
     third_party_settings: {  }
+  field_years:
+    type: edtf_default
+    weight: 40
+    region: content
+    label: above
+    settings:
+      date_separator: dash
+      date_order: big_endian
+      month_format: mm
+      day_format: dd
+    third_party_settings: {  }
   islandora_fits_checksum:
     weight: 39
     region: content
@@ -440,7 +451,6 @@ hidden:
   field_dspace_item_id: true
   field_gemini_uri: true
   field_jhir: true
-  field_sort_date: true
   field_unique_id: true
   field_weight: true
   openseadragon_media_evas_entity_view_2: true

diff --git a/codebase/config/sync/core.entity_view_display.node.islandora_object.pdfjs.yml b/codebase/config/sync/core.entity_view_display.node.islandora_object.pdfjs.yml
@@ -42,13 +42,13 @@ dependencies:
     - field.field.node.islandora_object.field_publisher
     - field.field.node.islandora_object.field_publisher_country
     - field.field.node.islandora_object.field_resource_type
-    - field.field.node.islandora_object.field_sort_date
     - field.field.node.islandora_object.field_spatial_coverage
     - field.field.node.islandora_object.field_subject
     - field.field.node.islandora_object.field_table_of_contents
     - field.field.node.islandora_object.field_title_language
     - field.field.node.islandora_object.field_unique_id
     - field.field.node.islandora_object.field_weight
+    - field.field.node.islandora_object.field_years
     - node.type.islandora_object
   enforced:
     module:
@@ -177,12 +177,12 @@ hidden:
   field_model: true
   field_publisher: true
   field_publisher_country: true
-  field_sort_date: true
   field_spatial_coverage: true
   field_table_of_contents: true
   field_title_language: true
   field_unique_id: true
   field_weight: true
+  field_years: true
   langcode: true
   openseadragon_media_evas_entity_view_1: true
   openseadragon_media_evas_entity_view_2: true

diff --git a/codebase/config/sync/core.entity_view_display.node.islandora_object.teaser.yml b/codebase/config/sync/core.entity_view_display.node.islandora_object.teaser.yml
@@ -42,13 +42,13 @@ dependencies:
     - field.field.node.islandora_object.field_publisher
     - field.field.node.islandora_object.field_publisher_country
     - field.field.node.islandora_object.field_resource_type
-    - field.field.node.islandora_object.field_sort_date
     - field.field.node.islandora_object.field_spatial_coverage
     - field.field.node.islandora_object.field_subject
     - field.field.node.islandora_object.field_table_of_contents
     - field.field.node.islandora_object.field_title_language
     - field.field.node.islandora_object.field_unique_id
     - field.field.node.islandora_object.field_weight
+    - field.field.node.islandora_object.field_years
     - node.type.islandora_object
   enforced:
     module:
@@ -115,13 +115,13 @@ hidden:
   field_publisher: true
   field_publisher_country: true
   field_resource_type: true
-  field_sort_date: true
   field_spatial_coverage: true
   field_subject: true
   field_table_of_contents: true
   field_title_language: true
   field_unique_id: true
   field_weight: true
+  field_years: true
   islandora_fits_checksum: true
   langcode: true
   members_eva_entity_view_1: true