From 0ef0d6aedff1cf7ebd06d301e257ebe88ca20ea4 Mon Sep 17 00:00:00 2001
From: Jonathan Rochkind <jonathan@dnil.net>
Date: Thu, 12 Dec 2024 16:21:22 -0500
Subject: [PATCH 1/5] Avoid gap in viewer footer for child works with very
 large windows

This CSS has gotten a bit hack on top of hack, but good enough for now.
---
 app/frontend/stylesheets/local/scihist_viewer.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/frontend/stylesheets/local/scihist_viewer.scss b/app/frontend/stylesheets/local/scihist_viewer.scss
index 2badc6210..c002b9822 100644
--- a/app/frontend/stylesheets/local/scihist_viewer.scss
+++ b/app/frontend/stylesheets/local/scihist_viewer.scss
@@ -364,6 +364,7 @@ $scihist_image_viewer_thumb_width: 54px; // Needs to match ImageServiceHelper::T
         padding: $btn-padding-y-lg $btn-padding-x-lg;
 
         border: 1px solid $primary;
+        max-width: unset;
         flex-grow: 4;
         white-space: nowrap;
         overflow: hidden;

From c7700bed392fa4a2bc03aca4cc1afcdbdaeaa427 Mon Sep 17 00:00:00 2001
From: Jonathan Rochkind <jonathan@dnil.net>
Date: Thu, 12 Dec 2024 16:24:34 -0500
Subject: [PATCH 2/5] avoid uppercasing title of child work in viewer footer

---
 app/frontend/stylesheets/local/scihist_viewer.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/frontend/stylesheets/local/scihist_viewer.scss b/app/frontend/stylesheets/local/scihist_viewer.scss
index c002b9822..d8c912ad6 100644
--- a/app/frontend/stylesheets/local/scihist_viewer.scss
+++ b/app/frontend/stylesheets/local/scihist_viewer.scss
@@ -370,8 +370,6 @@ $scihist_image_viewer_thumb_width: 54px; // Needs to match ImageServiceHelper::T
         overflow: hidden;
         text-overflow: ellipsis;
         text-align: left;
-
-        text-transform: uppercase;
       }
       .viewer-spacer {
         width: 0;

From fc93ae9ef0b7ac5b1b8097ff065ad6b5a22f6c69 Mon Sep 17 00:00:00 2001
From: Jonathan Rochkind <jonathan@dnil.net>
Date: Thu, 12 Dec 2024 12:14:51 -0500
Subject: [PATCH 3/5] Remove yarn resolution to bootstrap4 no longer needed or
 wanted because we are using bootstrap4

This may have caused both bootstrap4 and 5 to be loaded in our app? Lucky it didn't cause terrible problems if it didn't!
---
 package.json | 3 ---
 yarn.lock    | 7 +------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 2af170e1e..aecd03474 100644
--- a/package.json
+++ b/package.json
@@ -25,9 +25,6 @@
     "vite-plugin-ruby": "^5.1.0",
     "vite-plugin-sass-glob-import": "^3.0.2"
   },
-  "resolutions": {
-    "blacklight-frontend/bootstrap": "^4.6.2"
-  },
   "browserslist": [
     "defaults"
   ],
diff --git a/yarn.lock b/yarn.lock
index 41df98764..7ffc85c2d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -379,12 +379,7 @@ blacklight-range-limit@9.0.0-beta2:
   dependencies:
     chart.js "^ 4.4.1"
 
-"bootstrap@>=4.3.1 <6.0.0", bootstrap@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.2.tgz#8e0cd61611728a5bf65a3a2b8d6ff6c77d5d7479"
-  integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==
-
-"bootstrap@^ 5.0.0":
+"bootstrap@>=4.3.1 <6.0.0", "bootstrap@^ 5.0.0":
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.3.tgz#de35e1a765c897ac940021900fcbb831602bac38"
   integrity sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==

From f6ce7ab99379f03dd0cd00257a5211dc5d0bb538 Mon Sep 17 00:00:00 2001
From: Eddie Rubeiz <erubeiz@sciencehistory.org>
Date: Wed, 18 Dec 2024 15:30:53 -0500
Subject: [PATCH 4/5] using a text field for box and folder

---
 app/controllers/catalog_controller.rb | 17 +++++++++++++++++
 app/indexers/work_indexer.rb          |  6 ++++++
 solr/config/schema.xml                |  6 ++++++
 spec/indexers/work_indexer_spec.rb    | 26 ++++++++++++++++++++++++++
 4 files changed, 55 insertions(+)

diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
index d56eb8737..799202132 100644
--- a/app/controllers/catalog_controller.rb
+++ b/app/controllers/catalog_controller.rb
@@ -361,6 +361,23 @@ def active_sort_fields
     # case for a BL "search field", which is really a dismax aggregate
     # of Solr search fields.
 
+
+    # See https://github.com/sciencehistory/scihist_digicoll/issues/2585
+    # Note that a Work can be associated with two consecutive boxes, in which case the box number is something like "34-35".
+    config.add_search_field('box') do |field|
+      field.label = 'Box'
+      field.solr_parameters = {
+        qf: 'box_tsi',
+      }
+    end
+
+    config.add_search_field('folder') do |field|
+      field.label = 'Folder'
+      field.solr_parameters = {
+        qf: 'folder_tsi',
+      }
+    end
+
     # config.add_search_field('title') do |field|
     #   # solr_parameters hash are sent to Solr as ordinary url query params.
     #   field.solr_parameters = {
diff --git a/app/indexers/work_indexer.rb b/app/indexers/work_indexer.rb
index 9d6b56ca6..bea23b3c1 100644
--- a/app/indexers/work_indexer.rb
+++ b/app/indexers/work_indexer.rb
@@ -61,6 +61,12 @@ class WorkIndexer < Kithe::Indexer
       acc.concat(DateIndexHelper.new(record).expanded_years)
     end
 
+    to_field "box_tsi",     obj_extract("physical_container"), transform( ->(v) { v.box    if v.box.present?    })
+    to_field "folder_tsi",  obj_extract("physical_container"), transform( ->(v) { v.folder if v.folder.present? })
+    to_field "box_sort",    obj_extract("physical_container"), transform( ->(v) { v.box[/\d+/]   if v.box.present?    })
+    to_field "folder_sort", obj_extract("physical_container"), transform( ->(v) { v.folder[/\d+/] if v.folder.present? })
+
+
     # For sorting by oldest first
     to_field "earliest_date" do |record, acc|
       # for Solr, we need in "xml schema" format, with 00:00:00 time, and UTC timezone
diff --git a/solr/config/schema.xml b/solr/config/schema.xml
index 0f5166959..2a8d48676 100644
--- a/solr/config/schema.xml
+++ b/solr/config/schema.xml
@@ -257,6 +257,12 @@
     <field name="latest_date" type="date_sortmissinglast" stored="true" indexed="true" multiValued="false"/>
     <field name="earliest_date" type="date_sortmissinglast" stored="true" indexed="true" multiValued="false"/>
 
+
+    <!-- Box and folder sort fields. Added by Science History Institute. -->
+    <field name="box_sort"    type="int_sortmissinglast" stored="true" indexed="true" multiValued="false"/>
+    <field name="folder_sort" type="int_sortmissinglast" stored="true" indexed="true" multiValued="false"/>
+
+
     <!-- Single-value title sort field. Used to sort collections of serials by title.
     See https://github.com/sciencehistory/scihist_digicoll/issues/2494
     If we can use the first value of (multivalued) text1_tesim instead, let's consider doing that.
diff --git a/spec/indexers/work_indexer_spec.rb b/spec/indexers/work_indexer_spec.rb
index c7d11db2f..63caec49b 100644
--- a/spec/indexers/work_indexer_spec.rb
+++ b/spec/indexers/work_indexer_spec.rb
@@ -41,6 +41,32 @@
     end
   end
 
+  # See https://github.com/sciencehistory/scihist_digicoll/issues/2585
+  describe "box and folder" do
+    let(:box_search_field) {'box_tsi'}
+    let(:box_sort_field)  {'box_sort'}
+    let(:folder_search_field) {'folder_tsi'}
+    let(:folder_sort_field)   {'folder_sort'}
+
+    let(:work_2) { create(:work, physical_container: Work::PhysicalContainer.new({"box"=>"1", "folder"=>"3"})) }
+    let(:work_3) { create(:work, physical_container: Work::PhysicalContainer.new({"box"=>"12, 34, 56", "folder"=>"56, 78, 10"})) }
+    let(:output_hash)   { WorkIndexer.new.map_record(work) }
+    let(:output_hash_2) { WorkIndexer.new.map_record(work_2) }
+    let(:output_hash_3) { WorkIndexer.new.map_record(work_3) }
+
+    it "puts the first consecutive digits, if found, into the sort fields, and everything into the search fields" do
+      expect(output_hash[box_search_field]).to eq ['Box']
+      expect(output_hash[folder_search_field]).to eq ['Folder']
+      expect(output_hash[box_sort_field]).to be_nil
+      expect(output_hash[folder_sort_field]).to be_nil
+
+      expect(output_hash_3[box_search_field]).to eq ['12, 34, 56']
+      expect(output_hash_3[folder_search_field]).to eq ['56, 78, 10']
+      expect(output_hash_3[box_sort_field]).to eq ['12']
+      expect(output_hash_3[folder_sort_field]).to eq ['56']
+    end
+  end
+
   describe "oral history" do
     let(:work) { create(:oral_history_work, format: ['text']) }
 

From d4ee77fe79c41bb3b00813db4f0e6ddb3c6613d2 Mon Sep 17 00:00:00 2001
From: Eddie Rubeiz <erubeiz@sciencehistory.org>
Date: Fri, 20 Dec 2024 12:14:39 -0500
Subject: [PATCH 5/5] adding a sort for box and folder

---
 app/controllers/catalog_controller.rb         | 17 +++++++
 app/controllers/collection_show_controller.rb |  5 ++
 app/indexers/work_indexer.rb                  |  5 ++
 solr/config/schema.xml                        |  6 +++
 .../collection_show_controller_spec.rb        | 46 +++++++++++++++++++
 spec/indexers/work_indexer_spec.rb            | 26 +++++++++++
 6 files changed, 105 insertions(+)

diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
index d56eb8737..799202132 100644
--- a/app/controllers/catalog_controller.rb
+++ b/app/controllers/catalog_controller.rb
@@ -361,6 +361,23 @@ def active_sort_fields
     # case for a BL "search field", which is really a dismax aggregate
     # of Solr search fields.
 
+
+    # See https://github.com/sciencehistory/scihist_digicoll/issues/2585
+    # Note that a Work can be associated with two consecutive boxes, in which case the box number is something like "34-35".
+    config.add_search_field('box') do |field|
+      field.label = 'Box'
+      field.solr_parameters = {
+        qf: 'box_tsi',
+      }
+    end
+
+    config.add_search_field('folder') do |field|
+      field.label = 'Folder'
+      field.solr_parameters = {
+        qf: 'folder_tsi',
+      }
+    end
+
     # config.add_search_field('title') do |field|
     #   # solr_parameters hash are sent to Solr as ordinary url query params.
     #   field.solr_parameters = {
diff --git a/app/controllers/collection_show_controller.rb b/app/controllers/collection_show_controller.rb
index edb907dc1..88a1b5ac0 100644
--- a/app/controllers/collection_show_controller.rb
+++ b/app/controllers/collection_show_controller.rb
@@ -40,6 +40,11 @@ def blacklight_config
     # and we need to make sure collection_id is allowed by BL, don't totally
     # understand this, as of BL 7.25
     config.search_state_fields << :collection_id
+
+    config.add_sort_field("box_folder") do |field|
+      field.label = "box and folder"
+      field.sort = "box_sort asc, folder_sort asc, title asc"
+    end
   end
 
   private
diff --git a/app/indexers/work_indexer.rb b/app/indexers/work_indexer.rb
index 9d6b56ca6..68662b0bf 100644
--- a/app/indexers/work_indexer.rb
+++ b/app/indexers/work_indexer.rb
@@ -61,6 +61,11 @@ class WorkIndexer < Kithe::Indexer
       acc.concat(DateIndexHelper.new(record).expanded_years)
     end
 
+    to_field "box_tsi",     obj_extract("physical_container"), transform( ->(v) { v.box    if v.box.present?    })
+    to_field "folder_tsi",  obj_extract("physical_container"), transform( ->(v) { v.folder if v.folder.present? })
+    to_field "box_sort",    obj_extract("physical_container"), transform( ->(v) { v.box[/\d+/]   if v.box.present?    })
+    to_field "folder_sort", obj_extract("physical_container"), transform( ->(v) { v.folder[/\d+/] if v.folder.present? })
+
     # For sorting by oldest first
     to_field "earliest_date" do |record, acc|
       # for Solr, we need in "xml schema" format, with 00:00:00 time, and UTC timezone
diff --git a/solr/config/schema.xml b/solr/config/schema.xml
index 0f5166959..2a8d48676 100644
--- a/solr/config/schema.xml
+++ b/solr/config/schema.xml
@@ -257,6 +257,12 @@
     <field name="latest_date" type="date_sortmissinglast" stored="true" indexed="true" multiValued="false"/>
     <field name="earliest_date" type="date_sortmissinglast" stored="true" indexed="true" multiValued="false"/>
 
+
+    <!-- Box and folder sort fields. Added by Science History Institute. -->
+    <field name="box_sort"    type="int_sortmissinglast" stored="true" indexed="true" multiValued="false"/>
+    <field name="folder_sort" type="int_sortmissinglast" stored="true" indexed="true" multiValued="false"/>
+
+
     <!-- Single-value title sort field. Used to sort collections of serials by title.
     See https://github.com/sciencehistory/scihist_digicoll/issues/2494
     If we can use the first value of (multivalued) text1_tesim instead, let's consider doing that.
diff --git a/spec/controllers/collection_show_controller_spec.rb b/spec/controllers/collection_show_controller_spec.rb
index 73f943899..1a9144f17 100644
--- a/spec/controllers/collection_show_controller_spec.rb
+++ b/spec/controllers/collection_show_controller_spec.rb
@@ -118,6 +118,52 @@
       end
     end
 
+    describe "box and folder order" do
+
+      let(:random_order) { (0..containers.length - 1).to_a.shuffle }
+
+      let(:containers) do  
+        [
+          { "box"=> "1",  "folder"=> "1"  },
+          { "box"=> "1" },
+          
+          { "box"=> "2",   "folder"=> "1"  },
+          { "box"=> "2",   "folder"=> "2"  },
+
+          { "box"=> "3",   "folder"=> "1"  },
+          { "box"=> "3",   "folder"=> "2"  },
+          { "box"=> "3-5", "folder"=> "6-4"},
+          
+          # Non-integer containers go at the end.
+          {                "folder"=> "1"   },
+          { "box"=> "??",  "folder"=> "goat"},
+          {  }
+        ]
+      end
+
+
+      let(:titles) do
+        containers.map do |pc|
+          "#{pc.try('box', 'none')},#{pc.try('folder', 'none')}"
+        end   
+      end
+
+      let!(:works) do
+        random_order.map do |i|
+          create( :work,
+            title:              titles[i],
+            physical_container: Work::PhysicalContainer.new(containers[i]),
+            contained_by:       [collection]
+          )
+        end
+      end
+
+      it "can sort by box and folder" do
+        get :index, params: {"q"=>"", "sort"=>"box_folder", "collection_id"=> collection.friendlier_id }
+        expect(titles_as_displayed).to eq titles
+      end
+    end
+
     describe "identical dates" do
       let(:default_sort_field) { 'oldest_date' }
       let(:four_years_in_arbitrary_order) { [1990, 1991, 1991, 1991] }
diff --git a/spec/indexers/work_indexer_spec.rb b/spec/indexers/work_indexer_spec.rb
index c7d11db2f..63caec49b 100644
--- a/spec/indexers/work_indexer_spec.rb
+++ b/spec/indexers/work_indexer_spec.rb
@@ -41,6 +41,32 @@
     end
   end
 
+  # See https://github.com/sciencehistory/scihist_digicoll/issues/2585
+  describe "box and folder" do
+    let(:box_search_field) {'box_tsi'}
+    let(:box_sort_field)  {'box_sort'}
+    let(:folder_search_field) {'folder_tsi'}
+    let(:folder_sort_field)   {'folder_sort'}
+
+    let(:work_2) { create(:work, physical_container: Work::PhysicalContainer.new({"box"=>"1", "folder"=>"3"})) }
+    let(:work_3) { create(:work, physical_container: Work::PhysicalContainer.new({"box"=>"12, 34, 56", "folder"=>"56, 78, 10"})) }
+    let(:output_hash)   { WorkIndexer.new.map_record(work) }
+    let(:output_hash_2) { WorkIndexer.new.map_record(work_2) }
+    let(:output_hash_3) { WorkIndexer.new.map_record(work_3) }
+
+    it "puts the first consecutive digits, if found, into the sort fields, and everything into the search fields" do
+      expect(output_hash[box_search_field]).to eq ['Box']
+      expect(output_hash[folder_search_field]).to eq ['Folder']
+      expect(output_hash[box_sort_field]).to be_nil
+      expect(output_hash[folder_sort_field]).to be_nil
+
+      expect(output_hash_3[box_search_field]).to eq ['12, 34, 56']
+      expect(output_hash_3[folder_search_field]).to eq ['56, 78, 10']
+      expect(output_hash_3[box_sort_field]).to eq ['12']
+      expect(output_hash_3[folder_sort_field]).to eq ['56']
+    end
+  end
+
   describe "oral history" do
     let(:work) { create(:oral_history_work, format: ['text']) }