fix: converted hardcoded relevance sort order to configuration individual

Apply first sort option none was specificly defined and if query text wasn't provided, which means that only facets were used

Author: litvinovg

api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java

@@ -462,10 +462,26 @@ private void addDefaultVitroFacets(VitroRequest vreq, SearchQuery query) {
 
     private void addSortRules(VitroRequest vreq, SearchQuery query, Map<String, SortConfiguration> sortOptions) {
         String sortType = getSortType(vreq);
+        if (sortOptions.isEmpty()) {
+            return;
+        }
         if (!StringUtils.isBlank(sortType) && sortOptions.containsKey(sortType)) {
             SortConfiguration conf = sortOptions.get(sortType);
             query.addSortField(conf.getField(vreq.getLocale()), conf.getSortOrder());
             conf.setSelected(true);
+            return;
+        }
+        boolean textQueryIsEmpty = StringUtils.isBlank(getQueryText(vreq));
+        // If text field is empty, apply the first sort option
+        if (textQueryIsEmpty) {
+            SortConfiguration conf = sortOptions.entrySet().iterator().next().getValue();
+            query.addSortField(conf.getField(vreq.getLocale()), conf.getSortOrder());
+            // If text field is not empty, sort by relevance
+        } else {
+            SortConfiguration conf = sortOptions.get("relevance");
+            if (conf != null) {
+                query.addSortField(conf.getField(vreq.getLocale()), conf.getSortOrder());
+            }
         }
     }
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchFiltering.java

@@ -125,12 +125,16 @@ public class SearchFiltering {
             + "WHERE {\n"
             + "    ?sort rdf:type search:Sort . \n"
             + "    ?sort rdfs:label ?sort_label .\n"
-            + "    ?sort search:sortField ?field .\n"
-            + "    ?sort search:id ?id .\n"
-            + "    ?field search:indexField ?searchField  .\n"
             + "    OPTIONAL {\n"
-            + "        ?field search:isLanguageSpecific ?f_multilingual  .\n"
-            + "        BIND(?f_multilingual as ?bind_multilingual) .\n"
+            + "        ?sort search:sortField ?field .\n"
+            + "        ?field search:indexField ?searchField  .\n"
+            + "        OPTIONAL {\n"
+            + "            ?field search:isLanguageSpecific ?f_multilingual  .\n"
+            + "            BIND(?f_multilingual as ?bind_multilingual) .\n"
+            + "        }\n"
+            + "    }\n"
+            + "    OPTIONAL {\n"
+            + "        ?sort search:id ?id .\n"
             + "    }\n"
             + "    OPTIONAL {\n"
             + "        ?sort search:isAscending ?f_ord  .\n"
@@ -340,12 +344,13 @@ public static Map<String, SortConfiguration> getSortConfigurations(VitroRequest
             ResultSet results = qexec.execSelect();
             while (results.hasNext()) {
                 QuerySolution solution = results.nextSolution();
-                if (solution.get("label") == null || solution.get("id") == null
-                        || solution.get("searchField") == null) {
+                RDFNode searchFieldNode = solution.get("searchField");
+                RDFNode idNode = solution.get("id");
+                if (solution.get("label") == null) {
                     continue;
                 }
-                String field = solution.get("searchField").toString();
-                String id = solution.get("id").toString();
+                String field = searchFieldNode == null ? "" : searchFieldNode.toString();
+                String id = idNode == null ? "" : idNode.toString();
                 String label = solution.get("label").toString();
 
                 SortConfiguration config = null;

home/src/main/resources/rdf/display/firsttime/search_individuals_vitro.n3

@@ -44,6 +44,9 @@
         vitro-search:order         30 ;
         vitro-search:id            "titleasc" .
 
+:sort_by_relevance a                vitro-search:Sort ;
+        vitro-search:id            "relevance" .
+
 :field_label_sort
         a                          vitro-search:SearchField ;
         vitro-search:isLanguageSpecific true ;

home/src/main/resources/rdf/i18n/en_US/display/firsttime/search_individuals_vitro.n3

@@ -6,6 +6,7 @@
 :filter_category rdfs:label "Category"@en-US .
 :sort_title_desc rdfs:label "Title Z-A"@en-US .
 :sort_title_asc rdfs:label "Title A-Z"@en-US .
+:sort_by_relevance rdfs:label "Relevance"@en-US .
 :field_label_sort rdfs:label "Label sort field"@en-US .
 :field_category rdfs:label "ClassGroup"@en-US .
 :field_type rdfs:label "Type"@en-US .

home/src/main/resources/rdf/i18n/en_US/interface-i18n/firsttime/vitro_extended_search.ttl

@@ -6,14 +6,6 @@
 @prefix skos:  <http://www.w3.org/2004/02/skos/core#> .
 @prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
 
-uil-data:search_results_relevance.Vitro
-        rdf:type         owl:NamedIndividual ;
-        rdf:type         uil:PropertyKey ;
-        rdfs:label       "Relevance"@en-US ;
-        uil:hasApp      "Vitro" ;
-        uil:hasKey      "search_results_relevance" ;
-        uil:hasPackage  "Vitro-languages" .
-
 uil-data:search_results_sort_by.Vitro
         rdf:type         owl:NamedIndividual ;
         rdf:type         uil:PropertyKey ;

webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl

@@ -265,15 +265,19 @@ ${headScripts.add('<script type="text/javascript" src="${urls.base}/bootstrap-5.
 <#macro printSorting>
 	<#if sorting?has_content>
 		<div>
-			<select form="search-form" name="sort" id="search-form-sort" onchange="this.form.submit()" >
-				<option value="">${i18n().search_results_sort_by} ${i18n().search_results_relevance}</option>
+			<select form="extended-search-form" name="sort" id="search-form-sort" onchange="$('#extended-search-form').submit()" >
+			    <#assign addDefaultOption = true>
 				<#list sorting as option>
 					<#if option.selected>
 						<option value="${option.id}" selected="selected">${i18n().search_results_sort_by} ${option.label}</option>
+						<#assign addDefaultOption = false>
 					<#else>
 						<option value="${option.id}" >${i18n().search_results_sort_by} ${option.label}</option>
 					</#if>
 				</#list>
+				<#if addDefaultOption>
+					<option disabled selected value="" style="display:none">${i18n().search_results_sort_by}</option>
+				</#if>
 			</select>
 		</div>
 	</#if>