Merge pull request #2928 from projectblacklight/json-title

Add special handling to add document titles to the json
projectblacklight · Dec 2, 2022 · 511deaf · 511deaf
2 parents da61bbb + 7286793
commit 511deaf
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 28 deletions.
diff --git a/app/views/catalog/index.json.jbuilder b/app/views/catalog/index.json.jbuilder
@@ -18,6 +18,8 @@ json.data do
     json.id document.id
     json.type doc_presenter.display_type.first
     json.attributes do
+      json.title doc_presenter.heading unless doc_presenter.fields_to_render.any? { |field_name, _field, _field_presenter| field_name.to_s == 'title' }
+
       doc_presenter.fields_to_render.each do |field_name, field, field_presenter|
         json.partial! 'field', field: field,
                                field_name: field_name,

diff --git a/app/views/catalog/show.json.jbuilder b/app/views/catalog/show.json.jbuilder
@@ -11,6 +11,8 @@ json.data do
   json.id @document.id
   json.type doc_presenter.display_type.first
   json.attributes do
+    json.title doc_presenter.heading unless doc_presenter.fields_to_render.any? { |field_name, _field, _field_presenter| field_name.to_s == 'title' }
+
     doc_presenter.fields_to_render.each do |field_name, field, field_presenter|
       json.partial! 'field', field: field,
                              field_name: field_name,

diff --git a/spec/controllers/catalog_controller_spec.rb b/spec/controllers/catalog_controller_spec.rb
@@ -148,7 +148,7 @@
       it "gets the documents" do
         expect(docs).to have(10).documents
         expect(docs.first['attributes'].keys).to match_array(
-          %w[author_tsim format language_ssim lc_callnum_ssim published_ssim title_tsim]
+          %w[author_tsim format language_ssim lc_callnum_ssim published_ssim title title_tsim]
         )
         expect(docs.first['links']['self']).to eq solr_document_url(id: docs.first['id'])
       end
@@ -324,7 +324,7 @@
         json = JSON.parse response.body
         expect(json["data"]["attributes"].keys).to match_array(
           %w[author_tsim format isbn_ssim language_ssim lc_callnum_ssim
-             published_ssim subtitle_tsim title_tsim url_suppl_ssim]
+             published_ssim subtitle_tsim title title_tsim url_suppl_ssim]
         )
       end
     end

diff --git a/spec/views/catalog/index.json.jbuilder_spec.rb b/spec/views/catalog/index.json.jbuilder_spec.rb
@@ -10,7 +10,7 @@
   end
   let(:config) do
     Blacklight::Configuration.new do |config|
-      config.add_index_field 'title', label: 'Title', field: 'title_tsim'
+      config.index.title_field = 'title_tsim'
       config.add_facet_field :format
     end
   end
@@ -66,29 +66,15 @@
                                 id: '123',
                                 type: 'Book',
                                 attributes: {
-                                  title: {
-                                    id: 'http://test.host/catalog/123#title',
-                                    type: 'document_value',
-                                    attributes: {
-                                      value: 'Book1',
-                                      label: 'Title'
-                                    }
-                                  }
+                                  title: 'Book1'
                                 },
                                 links: { self: 'http://test.host/catalog/123' }
                               },
                               {
                                 id: '456',
                                 type: 'Article',
                                 attributes: {
-                                  title: {
-                                    id: 'http://test.host/catalog/456#title',
-                                    type: 'document_value',
-                                    attributes: {
-                                      value: 'Article1',
-                                      label: 'Title'
-                                    }
-                                  }
+                                  title: 'Article1'
                                 },
                                 links: { self: 'http://test.host/catalog/456' }
                               }

diff --git a/spec/views/catalog/show.json.jbuilder_spec.rb b/spec/views/catalog/show.json.jbuilder_spec.rb
@@ -6,7 +6,7 @@
   end
   let(:config) do
     Blacklight::Configuration.new do |config|
-      config.add_show_field 'title', label: 'Title', field: 'title_tsim'
+      config.show.title_field = 'title_tsim'
     end
   end
 
@@ -27,14 +27,7 @@
         id: '123',
         type: 'Book',
         attributes: {
-          'title' => {
-            id: 'http://test.host/catalog/123#title',
-            type: 'document_value',
-            attributes: {
-              value: 'Book1',
-              label: 'Title'
-            }
-          }
+          'title' => 'Book1'
         }
       })
   end