Merge pull request #222 from scientist-softserv/CKUpdates2024-04

Ck updates2024 04
scientist-softserv · Apr 29, 2024 · ec09fec · ec09fec
2 parents 39c9b1a + 8d61a39
commit ec09fec
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
@@ -85,6 +85,7 @@ def self.modified_field
     config.add_facet_field 'degree_sim', limit: 5, label: 'Degree'
     config.add_facet_field 'discipline_sim', limit: 5, label: 'Discipline'
     config.add_facet_field 'degree_granting_institution_sim', limit: 5, label: 'Degree Granting Institution'
+    config.add_facet_field 'department_sim', limit: 5, label: 'Department'
     config.add_facet_field 'funder_name_sim', limit: 5, label: 'Funder Name'
     config.add_facet_field 'event_title_sim', limit: 5, label: 'Event Title'
     config.add_facet_field 'event_date_sim', limit: 5, label: 'Event Date'

diff --git a/app/forms/hyrax/etd_form.rb b/app/forms/hyrax/etd_form.rb
@@ -34,11 +34,11 @@ class EtdForm < Hyrax::Forms::WorkForm
       types
     ]
 
-    self.terms = %i[title location alternative_title creator contributor description abstract
-                    keyword subject rights_statement publisher advisor
-                    committee_member department date_created year resource_type
+    self.terms = %i[title license location alternative_title creator contributor
+                    description abstract keyword subject rights_statement publisher
+                    advisor committee_member department date_created year resource_type
                     institution degree discipline degree_granting_institution types
-                    license language format identifier based_near access_right
+                    language format identifier based_near access_right
                     rights_notes related_url video_embed bibliographic_citation
                     additional_rights_info
                     representative_id thumbnail_id rendering_ids files
@@ -53,7 +53,7 @@ class EtdForm < Hyrax::Forms::WorkForm
     ]
 
     def primary_terms
-      super - %i[video_embed] + %i[keyword] + %i[license]
+      super - %i[video_embed] + %i[keyword]
     end
   end
 end
diff --git a/app/models/etd.rb b/app/models/etd.rb
@@ -71,15 +71,15 @@ def video_embed?
            end
 
   property :advisor, predicate: ::RDF::URI('https://atla.com/terms/advisor') do |index|
-    index.as :stored_searchable
+    index.as :stored_searchable, :facetable
   end
 
   property :committee_member, predicate: ::RDF::URI('https://atla.com/terms/committeeMember') do |index|
-    index.as :stored_searchable
+    index.as :stored_searchable, :facetable
   end
 
   property :department, predicate: ::RDF::URI('https://atla.com/terms/department') do |index|
-    index.as :stored_searchable
+    index.as :stored_searchable, :facetable
   end
 
   property :year, predicate: ::RDF::Vocab::DC.date, multiple: false do |index|

diff --git a/app/models/paper_or_report.rb b/app/models/paper_or_report.rb
@@ -31,11 +31,11 @@ def video_embed?
   end
 
   property :format, predicate: ::RDF::Vocab::DC11.format do |index|
-    index.as :stored_searchable
+    index.as :stored_searchable, :facetable
   end
 
   property :rights_holder, predicate: ::RDF::Vocab::DC.rightsHolder do |index|
-    index.as :stored_searchable
+    index.as :stored_searchable, :facetable
   end
 
   property :creator_orcid, predicate: ::RDF::Vocab::SCHEMA.creator, multiple: false do |index|
@@ -44,7 +44,7 @@ def video_embed?
 
   property :creator_institutional_relationship,
            predicate: ::RDF::URI.intern('https://atla.com/terms/creatorInstitutionalRelationship') do |index|
-             index.as :stored_searchable
+             index.as :stored_searchable, :facetable
            end
 
   property :contributor_orcid,
@@ -55,7 +55,7 @@ def video_embed?
 
   property :contributor_institutional_relationship,
            predicate: ::RDF::URI.intern('https://atla.com/terms/contributorInstitutionalRelationship') do |index|
-             index.as :stored_searchable
+             index.as :stored_searchable, :facetable
            end
 
   property :contributor_role, predicate: ::RDF::URI('https://atla.com/terms/contributorRole') do |index|
@@ -79,11 +79,11 @@ def video_embed?
   end
 
   property :event_location, predicate: ::RDF::URI('https://atla.com/terms/eventLocation') do |index|
-    index.as :stored_searchable
+    index.as :stored_searchable, :facetable
   end
 
   property :event_date, predicate: ::RDF::URI('https://atla.com/terms/eventDate') do |index|
-    index.as :stored_searchable
+    index.as :stored_searchable, :facetable
   end
 
   property :official_link, predicate: ::RDF::Vocab::SCHEMA.url do |index|