From 83b30bd6222e0f809e911f7907c40594d082998e Mon Sep 17 00:00:00 2001 From: Sarah Proctor Date: Tue, 17 Sep 2024 15:03:23 -0700 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=90=9B=20Sort=20by:=20Published=20Dat?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit pulls in an update to Hyku that fixes a bug when sorting by title, author, and created date (published date). The Hyku indexing moves from `CollectionResource` to `CollectionResourceIndexer`. Ref: - https://github.com/scientist-softserv/adventist_knapsack/issues/185 --- app/controllers/catalog_controller_decorator.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/catalog_controller_decorator.rb b/app/controllers/catalog_controller_decorator.rb index 3ef21828..853d9911 100644 --- a/app/controllers/catalog_controller_decorator.rb +++ b/app/controllers/catalog_controller_decorator.rb @@ -115,12 +115,12 @@ def self.uploaded_field config.add_sort_field "score desc, #{uploaded_field} desc", label: "Relevance" # TODO: replace CatalogController.title_field to return 'title_ssi' - config.add_sort_field "title_ssi asc", label: "Title" + config.add_sort_field "title_ssim asc", label: "Title" # TODO: replace CatalogController.creator_field to return 'creator_ssi' - config.add_sort_field "creator_ssi asc", label: "Author" + config.add_sort_field "creator_ssim asc", label: "Author" # TODO: replace CatalogController.created_field to return 'created_ssi' - config.add_sort_field "created_ssi asc", label: "Published Date (Ascending)" - config.add_sort_field "created_ssi desc", label: "Published Date (Descending)" + config.add_sort_field "#{CatalogController.created_field} asc", label: "Published Date (Ascending)" + config.add_sort_field "#{CatalogController.created_field} desc", label: "Published Date (Descending)" config.add_sort_field "#{CatalogController.modified_field} asc", label: "Upload Date (Ascending)" config.add_sort_field "#{CatalogController.modified_field} desc", label: "Upload Date (Descending)" end From 66f602dbf3e0e424694ab8800b2fc565fcd1650b Mon Sep 17 00:00:00 2001 From: Sarah Proctor Date: Wed, 18 Sep 2024 13:26:51 -0700 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=90=9B=20Updates=20the=20submodule?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit updates the submodule to the latest version of Hyku which removes HykuIndexing mix in from the CollectionResource model and adds HykuIndexing mix in to CollectionResourceIndexer to fix a bug when sorting the catalog. Hyku PR: https://github.com/samvera/hyku/pull/2327 Ref: - https://github.com/scientist-softserv/adventist_knapsack/issues/185 --- hyrax-webapp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hyrax-webapp b/hyrax-webapp index d2612073..6ad34e19 160000 --- a/hyrax-webapp +++ b/hyrax-webapp @@ -1 +1 @@ -Subproject commit d26120737335bb3b75f790511c83a17b2094caf0 +Subproject commit 6ad34e1973d5948a04afe3b34a9f22cfabbce9b8 From bc5a811b4afbbdc4341fa1027157cb554e5569a1 Mon Sep 17 00:00:00 2001 From: Sarah Proctor Date: Fri, 20 Sep 2024 09:58:23 -0700 Subject: [PATCH 3/4] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Updates=20hyrax-webapp?= =?UTF-8?q?=20submodule?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pulls in the latest changes from the hyrax-webapp submodule to address a failing spec. Ref: - https://github.com/scientist-softserv/adventist_knapsack/issues/185 --- hyrax-webapp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hyrax-webapp b/hyrax-webapp index c09966ba..b193a393 160000 --- a/hyrax-webapp +++ b/hyrax-webapp @@ -1 +1 @@ -Subproject commit c09966ba4665e3a0ee73f25ed1f2d2018a833e40 +Subproject commit b193a393d7ec971bf55dff73910f805912024667 From 5aec8ea516bddd68bf2c24e246675879b3db0115 Mon Sep 17 00:00:00 2001 From: Sarah Proctor Date: Mon, 23 Sep 2024 10:09:22 -0700 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=90=9B=20Removes=20multiple=20indicat?= =?UTF-8?q?or=20from=20sorting=20configs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit improves communication of intent by removing the multiple indicator from the sorting configs since the sort happens on a single item from each field. Ref: - https://github.com/scientist-softserv/adventist_knapsack/issues/185 --- app/controllers/catalog_controller_decorator.rb | 4 ++-- hyrax-webapp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/catalog_controller_decorator.rb b/app/controllers/catalog_controller_decorator.rb index 853d9911..3bf180a4 100644 --- a/app/controllers/catalog_controller_decorator.rb +++ b/app/controllers/catalog_controller_decorator.rb @@ -115,9 +115,9 @@ def self.uploaded_field config.add_sort_field "score desc, #{uploaded_field} desc", label: "Relevance" # TODO: replace CatalogController.title_field to return 'title_ssi' - config.add_sort_field "title_ssim asc", label: "Title" + config.add_sort_field "title_ssi asc", label: "Title" # TODO: replace CatalogController.creator_field to return 'creator_ssi' - config.add_sort_field "creator_ssim asc", label: "Author" + config.add_sort_field "creator_ssi asc", label: "Author" # TODO: replace CatalogController.created_field to return 'created_ssi' config.add_sort_field "#{CatalogController.created_field} asc", label: "Published Date (Ascending)" config.add_sort_field "#{CatalogController.created_field} desc", label: "Published Date (Descending)" diff --git a/hyrax-webapp b/hyrax-webapp index b193a393..d6892bf3 160000 --- a/hyrax-webapp +++ b/hyrax-webapp @@ -1 +1 @@ -Subproject commit b193a393d7ec971bf55dff73910f805912024667 +Subproject commit d6892bf320faf784fa7b61241d3505548fd18b33