blacklight 7.32.0 → 7.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17b8b14189b4ced9faa60d183fa887eb6962dba4d55f3718fee11ff4bed59388
-  data.tar.gz: dd1f5ea853080c0732313b3ab64de8d310634786cfbcfe5ddde6691bc2137820
+  metadata.gz: cddd27d147401ca52ab08c98094933b5327eff0fb3e160eaa960975a9697246f
+  data.tar.gz: f714a77235467a6088f021d4b44e2d1826a407a5cf922eb53d78ac163a470f6a
 SHA512:
-  metadata.gz: d481b3b290ca1030fcc593fad5ef8fdbe3e5a42091c4138af3efaaa58b45322f32d8e4956e6d92d01d305e762d4e2a3886f9caa193ba4197920d18d989184308
-  data.tar.gz: f6010fc1c00b31fddce8d2e73794655dbe3c1c690e65bedace78c693a4c36a884f5ac0589681717e3852bf9e1ff41109a7d5de2c2d4957e835c59afd53cfcfcb
+  metadata.gz: ab11dc139997c5398b1c83cc72ddf1142598bf3e50f8bdca34d2e74fb7e9159b209237ad11a60cc23fe8313eab0436f03615e81ae204480a2552173d24b967d8
+  data.tar.gz: 7a1b670887503b620af4b36ce44504c155f494b3d1c1e35ed57d8f90471c7e7aeb1be5fb815d383baf98de89d2924ec481a2ba4c3567b9a0ed222f02a47f5596

data/VERSION

@@ -1 +1 @@
-7.32.0
+7.33.0

data/app/assets/stylesheets/blacklight/_controls.scss

@@ -23,19 +23,12 @@
   cursor: pointer;
 }
 
-.no-js .sort-pagination {
-  & {
-    @extend .clearfix;
+.no-js {
+  .btn-group:focus-within {
+    .dropdown-menu {
+      @extend .show;
+    }
   }
-  .dropdown-menu {
-    background: none;
-    box-shadow: none;
-    border: none;
-    position: relative;
-    display: block;
-    float: none;
-  }
-
 }
 
 .view-type {

data/app/assets/stylesheets/blacklight/_facets.scss

@@ -37,6 +37,30 @@
   }
 }
 
+.no-js {
+  @include media-breakpoint-down(lg) {
+    #sidebar {
+      order: 6 !important;
+    }
+  }
+
+  .facet-content.collapse {
+    display: block;
+  }
+
+  .facet-toggle-handle {
+    display: none;
+  }
+
+  .pivot-facet.collapse {
+    display: block;
+  }
+
+  .facets-collapse.collapse {
+    display: block;
+  }
+}
+
 .facets-header {
   display: flex;
   justify-content: space-between;

data/app/controllers/concerns/blacklight/bookmarks.rb

@@ -58,11 +58,9 @@ module Blacklight::Bookmarks
     create
   end
 
-  # For adding a single bookmark, suggest use PUT/#update to
-  # /bookmarks/$docuemnt_id instead.
-  # But this method, accessed via POST to /bookmarks, can be used for
-  # creating multiple bookmarks at once, by posting with keys
-  # such as bookmarks[n][document_id], bookmarks[n][title].
+  # For adding a single bookmark, suggest use PUT to /bookmarks/:document_id instead (triggering the #update method).
+  # This method, accessed via POST to /bookmarks, can be used for creating multiple bookmarks at once, by posting
+  # with keys such as bookmarks[n][document_id], bookmarks[n][title].
   # It can also be used for creating a single bookmark by including keys
   # bookmark[title] and bookmark[document_id], but in that case #update
   # is simpler.

data/app/views/catalog/index.json.jbuilder

@@ -17,6 +17,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,

data/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,

data/app/views/layouts/blacklight/base.html.erb

@@ -9,10 +9,13 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <title><%= render_page_title %></title>
+    <script>
+      document.querySelector('html').classList.remove('no-js');
+    </script>
     <%= opensearch_description_tag application_name, opensearch_catalog_url(format: 'xml') %>
     <%= favicon_link_tag %>
-    <%= stylesheet_link_tag "application", media: "all" %>
-    <%= javascript_include_tag "application" %>
+    <%= stylesheet_link_tag "application", media: "all", "data-turbo-track": "reload" %>
+    <%= javascript_include_tag "application", "data-turbo-track": "reload" %>
 
     <%= csrf_meta_tags %>
     <%= content_for(:head) %>

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "7.25.0",
+  "version": "7.32.0",
   "description": "[![Build Status](https://travis-ci.com/projectblacklight/blacklight.png?branch=main)](https://travis-ci.com/projectblacklight/blacklight) [![Gem Version](https://badge.fury.io/rb/blacklight.png)](http://badge.fury.io/rb/blacklight) [![Coverage Status](https://coveralls.io/repos/github/projectblacklight/blacklight/badge.svg?branch=main)](https://coveralls.io/github/projectblacklight/blacklight?branch=main)",
   "main": "app/assets/javascripts/blacklight",
   "scripts": {

data/spec/controllers/catalog_controller_spec.rb

@@ -151,7 +151,7 @@ RSpec.describe CatalogController, api: true do
       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
@@ -327,7 +327,7 @@ RSpec.describe CatalogController, api: true do
         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

data/spec/features/bookmarks_spec.rb

@@ -40,6 +40,15 @@ RSpec.describe "Bookmarks" do
     expect(page).to have_content 'Successfully removed bookmark.'
   end
 
+  it 'shows bookmarks as checkboxes', js: true do
+    visit solr_document_path('2007020969')
+    check 'Bookmark'
+
+    visit solr_document_path('2007020969')
+    expect(page).to have_css('input[type="checkbox"]:checked')
+    uncheck 'In Bookmarks'
+  end
+
   it "adds bookmarks after a user logs in" do
     visit solr_document_path('2007020969')
     click_button 'Bookmark'

data/spec/views/catalog/index.json.jbuilder_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe "catalog/index.json", api: true do
   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,14 +66,7 @@ RSpec.describe "catalog/index.json", api: true do
                                 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' }
                               },
@@ -81,14 +74,7 @@ RSpec.describe "catalog/index.json", api: true do
                                 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' }
                               }

data/spec/views/catalog/show.json.jbuilder_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe "catalog/show.json" do
   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 @@ RSpec.describe "catalog/show.json" do
         id: '123',
         type: 'Book',
         attributes: {
-          'title' => {
-            id: 'http://test.host/catalog/123#title',
-            type: 'document_value',
-            attributes: {
-              value: 'Book1',
-              label: 'Title'
-            }
-          }
+          'title' => 'Book1'
         }
       })
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.32.0
+  version: 7.33.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-16 00:00:00.000000000 Z
+date: 2022-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails