Merge pull request #320 from wgilling/pre-LAGS-129

Pre lags 129
jhu-idc · Jun 10, 2022 · 88700df · 88700df
2 parents 74f1b48 + bbf327e
commit 88700df
Show file tree

Hide file tree

Showing 15 changed files with 130 additions and 448 deletions.
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,19 +41,20 @@ 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
@@ -112,7 +113,7 @@ third_party_settings:
         - field_date_created
         - field_date_published
         - field_date_copyrighted
-        - group_date_solr_year
+        - field_sort_date
       parent_name: ''
       weight: 2
       format_type: details
@@ -194,20 +195,6 @@ 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
@@ -237,7 +224,7 @@ content:
     type: options_buttons
     region: content
   field_access_terms:
-    weight: 10
+    weight: 11
     settings: {  }
     third_party_settings: {  }
     type: options_select
@@ -377,20 +364,20 @@ content:
     region: content
   field_display_hints:
     type: options_buttons
-    weight: 11
+    weight: 12
     region: content
     settings: {  }
     third_party_settings: {  }
   field_dspace_identifier:
-    weight: 67
+    weight: 68
     settings:
       placeholder_url: ''
       placeholder_title: ''
     third_party_settings: {  }
     type: link_default
     region: content
   field_dspace_item_id:
-    weight: 68
+    weight: 69
     settings:
       size: 60
       placeholder: ''
@@ -490,7 +477,7 @@ content:
     region: content
   field_member_of:
     type: entity_reference_autocomplete
-    weight: 9
+    weight: 10
     region: content
     settings:
       match_operator: CONTAINS
@@ -557,6 +544,12 @@ 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:
@@ -593,29 +586,20 @@ content:
     type: options_select
     region: content
   field_unique_id:
-    weight: 12
+    weight: 13
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
     type: string_textfield
     region: content
   field_weight:
-    weight: 13
+    weight: 14
     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,19 +41,20 @@ 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
@@ -395,6 +396,15 @@ 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
@@ -428,17 +438,6 @@ 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,17 +405,6 @@ 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
@@ -451,6 +440,7 @@ 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

diff --git a/codebase/config/sync/facets.facet.years.yml → codebase/config/sync/facets.facet.date.yml b/codebase/config/sync/facets.facet.years.yml → codebase/config/sync/facets.facet.date.yml
@@ -1,4 +1,4 @@
-uuid: abeba1dd-9a63-4043-99db-8f9d5493d99b
+uuid: 36253efe-86ba-4782-9f32-74c27203c6fa
 langcode: en
 status: true
 dependencies:
@@ -7,18 +7,18 @@ dependencies:
     - views.view.solr_search_content
   module:
     - search_api
-id: years
-name: Years
-url_alias: years
+id: date
+name: Date
+url_alias: date
 weight: 0
 min_count: 1
 show_only_one_result: false
-field_identifier: field_years
+field_identifier: solr_years
 facet_source_id: 'search_api:views_rest__solr_search_content__rest_export_1'
 widget:
   type: array
   config:
-    show_numbers: true
+    show_numbers: false
 query_operator: or
 use_hierarchy: false
 keep_hierarchy_parents_active: false
@@ -31,21 +31,15 @@ processor_configs:
   active_widget_order:
     processor_id: active_widget_order
     weights:
-      sort: -10
-    settings:
-      sort: ASC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: -8
+      sort: 20
     settings:
       sort: DESC
   display_value_widget_order:
     processor_id: display_value_widget_order
     weights:
-      sort: -9
+      sort: 40
     settings:
-      sort: ASC
+      sort: DESC
   url_processor_handler:
     processor_id: url_processor_handler
     weights: