From b5653f42fca5fb34c390288009b728068191db16 Mon Sep 17 00:00:00 2001 From: Oleksiy 'Alex' Levshyn Date: Thu, 24 Oct 2024 15:15:35 +0200 Subject: [PATCH 01/14] MIR-1362 fix SOLR query filter --- .../META-INF/resources/js/mir/base.js | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js index b5c9f006fd..c2032c80ff 100644 --- a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js +++ b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js @@ -305,21 +305,31 @@ // do nothing if a query is missing $( ".search_box form" ).submit( function( event ) { if($(this).find("input[name='qry']").val().trim() != '') { - var origSearchAction = $(this).attr('action'); - var addValue = encodeURIComponent(solrEscapeSearchValue($('.search_box input').val().trim())); + const origSearchAction = $(this).attr('action'); + // To get the condQuery parameter, the URLSearchParams API is used + // (https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams) + // (compatible: https://caniuse.com/?search=URLSearchParams) + const urlObj = new URL(origSearchAction); + // Get the query parameters + const params = new URLSearchParams(urlObj.search); + // Get the 'condQuery' parameter value + const condQuery = params.get('condQuery'); + const searchTypeButtonValueAttr = $('#search_type_button').attr('value'); + const addValue = encodeURIComponent(solrEscapeSearchValue($('.search_box input').val().trim())); + let newAction; if (origSearchAction.includes('servlets/solr/find')) { - var replAction = origSearchAction.replace(/(.*[&|\?])(condQuery=.*?)&(.*)/,'$1$3'); - if ($('#search_type_button').attr('value') == 'all') { - var newAction = replAction + "&condQuery=" + addValue; + const replAction = origSearchAction.replace(/(.*[&|\?])(condQuery=.*?)&(.*)/,'$1$3'); + if (searchTypeButtonValueAttr === 'all') { + newAction = replAction + "&condQuery=" + condQuery + "&fq=allMeta:" + addValue; } else { - var newAction = replAction + "&condQuery=" + addValue + "&df=" + $('#search_type_button').attr('value'); + newAction = replAction + "&condQuery=" + condQuery + "&fq=" + searchTypeButtonValueAttr + ":" + addValue; } - } else { - var replAction = origSearchAction.replace(/(.*[&|\?])(condQuery=.*?)&(.*)/,'$1$3&$2'); - if ($('#search_type_button').attr('value') == 'all') { - var newAction = replAction + "+%2BallMeta:" + addValue; + } else { // TODO: do it right + const replAction = origSearchAction.replace(/(.*[&|\?])(condQuery=.*?)&(.*)/,'$1$3&$2'); + if (searchTypeButtonValueAttr === 'all') { + newAction = replAction + "+%2BallMeta:" + addValue; } else { - var newAction = replAction + "+%2B" + $('#search_type_button').attr('value') + ":" + addValue; + newAction = replAction + "+%2B" + searchTypeButtonValueAttr + ":" + addValue; } } $(this).attr('action', newAction); From bf7b6e9f86d769b93437e8fafbfa8ad9000499fd Mon Sep 17 00:00:00 2001 From: Oleksiy 'Alex' Levshyn Date: Fri, 25 Oct 2024 11:28:13 +0200 Subject: [PATCH 02/14] MIR-1362 fix SOLR-request for all fields --- mir-module/src/main/resources/META-INF/resources/js/mir/base.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js index c2032c80ff..0459c80972 100644 --- a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js +++ b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js @@ -320,7 +320,7 @@ if (origSearchAction.includes('servlets/solr/find')) { const replAction = origSearchAction.replace(/(.*[&|\?])(condQuery=.*?)&(.*)/,'$1$3'); if (searchTypeButtonValueAttr === 'all') { - newAction = replAction + "&condQuery=" + condQuery + "&fq=allMeta:" + addValue; + newAction = replAction + "&condQuery=" + condQuery + "+AND+" + addValue; } else { newAction = replAction + "&condQuery=" + condQuery + "&fq=" + searchTypeButtonValueAttr + ":" + addValue; } From 82622a27b78f6cec1f631c79f268c559b9068c30 Mon Sep 17 00:00:00 2001 From: Oleksiy 'Alex' Levshyn Date: Wed, 13 Nov 2024 11:35:49 +0100 Subject: [PATCH 03/14] MIR-1362 change and fix the second search with filter query etc --- .../xsl/mir-flatmir-layout-utils.xsl | 1 + .../META-INF/resources/js/mir/base.js | 110 +++++--- .../src/main/resources/xsl/response-mir.xsl | 253 ++++++++++++++---- 3 files changed, 268 insertions(+), 96 deletions(-) diff --git a/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl b/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl index 5a023acd5a..4c3886ac5f 100644 --- a/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl +++ b/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl @@ -73,6 +73,7 @@ id="searchInput" type="text" aria-label="Search" /> + diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js index 0459c80972..0eac4b1802 100644 --- a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js +++ b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js @@ -293,52 +293,78 @@ }); }); - //for select box in search field on hit list page - $( ".search_type a" ).click(function() { - $( "#search_type_label" ).html( $( this ).html() ); - $( "#search_type_button" ).attr( 'value', $( this ).attr('value') ); + // Input element in the original search + const originalSearchInputElement = "#searchInput"; + // Selector for the search form + const subSearchFormName = "form.search_form"; + // ID of the input field for the second search text + const qrySelector = "#qry"; + // ID of the select box with the filter query key + const selectMods = "#select_mods"; + // ID of the hidden element with the fq parameter + const fqElement = "#fq"; + // ID of the hidden element with the initial condQuery parameter in the first search form + const initialCondQueryFirst = "#initialCondQuery"; + // ID of the hidden element with the initial condQuery parameter in the second search form + const initialCondQuerySecond = "#initialCondQuerySecond"; + // ID of the hidden element 'condQuery' for the query parameter 'condQuery' + const condQuery = "#condQuery"; + + // Input element's changes in the original search + $(originalSearchInputElement).change(() => { + if ($(initialCondQueryFirst)) { + $(initialCondQueryFirst).attr('value', $('#searchInput').val().trim()); + } }); - // filter for result lists - // modify search query - // TODO: modify? add why and how - // do nothing if a query is missing - $( ".search_box form" ).submit( function( event ) { - if($(this).find("input[name='qry']").val().trim() != '') { - const origSearchAction = $(this).attr('action'); - // To get the condQuery parameter, the URLSearchParams API is used - // (https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams) - // (compatible: https://caniuse.com/?search=URLSearchParams) - const urlObj = new URL(origSearchAction); - // Get the query parameters - const params = new URLSearchParams(urlObj.search); - // Get the 'condQuery' parameter value - const condQuery = params.get('condQuery'); - const searchTypeButtonValueAttr = $('#search_type_button').attr('value'); - const addValue = encodeURIComponent(solrEscapeSearchValue($('.search_box input').val().trim())); - let newAction; - if (origSearchAction.includes('servlets/solr/find')) { - const replAction = origSearchAction.replace(/(.*[&|\?])(condQuery=.*?)&(.*)/,'$1$3'); - if (searchTypeButtonValueAttr === 'all') { - newAction = replAction + "&condQuery=" + condQuery + "+AND+" + addValue; - } else { - newAction = replAction + "&condQuery=" + condQuery + "&fq=" + searchTypeButtonValueAttr + ":" + addValue; - } - } else { // TODO: do it right - const replAction = origSearchAction.replace(/(.*[&|\?])(condQuery=.*?)&(.*)/,'$1$3&$2'); - if (searchTypeButtonValueAttr === 'all') { - newAction = replAction + "+%2BallMeta:" + addValue; - } else { - newAction = replAction + "+%2B" + searchTypeButtonValueAttr + ":" + addValue; - } - } - $(this).attr('action', newAction); - } else { - // nothing to do if a value is missing - event.preventDefault(); - } + // Changes in the select box for the filter query + $(selectMods).change(() => { + setFQAndCondQueryElementsValues(); + }); + + // Changes in the input field of the filter query + $(qrySelector).change(() => { + setFQAndCondQueryElementsValues(); }); + // Changes for the fq element and condQuery element + function setFQAndCondQueryElementsValues() { + if ($(selectMods) && $(qrySelector) && $(fqElement) && $(initialCondQuerySecond) && $(condQuery)) { + let queryText = ''; + if ($(qrySelector).val() !== '') { + queryText = $(qrySelector).val().trim(); + // Remove all duplicate spaces, tabs, newlines etc + queryText = queryText.replace(/\s\s+/g, ' '); + } + + const initialCondQueryValue = $(initialCondQuerySecond).val().trim(); + + const selectModsValue = $(selectMods).val(); + // Case if selectMods is 'all' - 'everything' + if (selectModsValue === 'all') { + $(fqElement).attr('value', ''); + let condQueryValue = initialCondQueryValue; + if (initialCondQueryValue !== '') { + if (queryText !== '') { + condQueryValue += ' AND ' + queryText; + } + } else { + if (queryText !== '') { + condQueryValue += queryText; + } + } + $(condQuery).attr('value', condQueryValue); + } else { + if (queryText !== '') { + // const selectModsValue = $(selectMods).val(); + const filterQuery = selectModsValue + ':' + queryText; + $(fqElement).attr('value', filterQuery); + $(condQuery).attr('value', initialCondQueryValue); + } + } + } + } + var languageList = jQuery('#topnav .languageList'); jQuery('#topnav .languageSelect').click(function() { languageList.toggleClass('hide'); diff --git a/mir-module/src/main/resources/xsl/response-mir.xsl b/mir-module/src/main/resources/xsl/response-mir.xsl index f8f6b32d84..8b89f46518 100644 --- a/mir-module/src/main/resources/xsl/response-mir.xsl +++ b/mir-module/src/main/resources/xsl/response-mir.xsl @@ -60,54 +60,129 @@
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
-
- - -
+ + + @@ -125,14 +200,84 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f51c3e6328a6bed8601a2b1de43e71216a3c6ed6 Mon Sep 17 00:00:00 2001 From: Oleksiy 'Alex' Levshyn Date: Fri, 15 Nov 2024 15:40:50 +0100 Subject: [PATCH 04/14] MIR-1362 fix empty value in the input query field, fix unit test --- .../it/controller/MIRSearchController.java | 28 +++---- .../META-INF/resources/js/mir/base.js | 80 ++++++++++++++----- 2 files changed, 72 insertions(+), 36 deletions(-) diff --git a/mir-it/src/test/java/org/mycore/mir/it/controller/MIRSearchController.java b/mir-it/src/test/java/org/mycore/mir/it/controller/MIRSearchController.java index bebfb23cb7..0b6e70d4b8 100644 --- a/mir-it/src/test/java/org/mycore/mir/it/controller/MIRSearchController.java +++ b/mir-it/src/test/java/org/mycore/mir/it/controller/MIRSearchController.java @@ -177,45 +177,45 @@ public void searchBy(String title) { public void searchByPublication(String title, String subTitle, String author, String name, String nameIdentifier, String metadata, String content) { + // select mods (filter query) is 'all' if (title != null) { - driver.waitAndFindElement(By.id("search_type_label")).click(); - driver.waitAndFindElement(MCRBy.partialLinkText("Alles")).click(); + new Select(driver.waitAndFindElement(By.id("select_mods"))).selectByValue("all"); qry(title); } + // select mods (filter query) is 'mods.title' if (subTitle != null) { - driver.waitAndFindElement(By.id("search_type_label")).click(); - driver.waitAndFindElement(MCRBy.partialLinkText("Titel")).click(); + new Select(driver.waitAndFindElement(By.id("select_mods"))).selectByValue("mods.title"); qry(subTitle); } + // select mods (filter query) is 'mods.author' if (author != null) { - driver.waitAndFindElement(By.id("search_type_label")).click(); - driver.waitAndFindElement(MCRBy.partialLinkText("Autor")).click(); + new Select(driver.waitAndFindElement(By.id("select_mods"))).selectByValue("mods.author"); qry(author); } + // select mods (filter query) is 'mods.name.top' if (name != null) { - driver.waitAndFindElement(By.id("search_type_label")).click(); - driver.waitAndFindElement(MCRBy.partialLinkText("Name")).click(); + new Select(driver.waitAndFindElement(By.id("select_mods"))).selectByValue("mods.name.top"); qry(name); } + // select mods (filter query) is 'mods.nameIdentifier' if (nameIdentifier != null) { - driver.waitAndFindElement(By.id("search_type_label")).click(); - driver.waitAndFindElement(MCRBy.partialLinkText("Namens Identifikator")).click(); + new Select(driver.waitAndFindElement(By.id("select_mods"))).selectByValue("mods.nameIdentifier"); qry(nameIdentifier); } + // select mods (filter query) is 'allMeta' if (metadata != null) { - driver.waitAndFindElement(By.id("search_type_label")).click(); - driver.waitAndFindElement(MCRBy.partialLinkText("Alle Metadaten")).click(); + new Select(driver.waitAndFindElement(By.id("select_mods"))).selectByValue("allMeta"); qry(metadata); } + // select mods (filter query) is 'content' if (content != null) { - driver.waitAndFindElement(By.id("search_type_label")).click(); - driver.waitAndFindElement(MCRBy.partialLinkText("Volltext")).click(); + new Select(driver.waitAndFindElement(By.id("select_mods"))).selectByValue("content"); qry(content); } diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js index 0eac4b1802..2508f0e449 100644 --- a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js +++ b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js @@ -295,8 +295,10 @@ // Input element in the original search const originalSearchInputElement = "#searchInput"; - // Selector for the search form + // Selector for the second search form const subSearchFormName = "form.search_form"; + // The submit button in the second search form + const secondSearchFormSubmitButtonElement = subSearchFormName + ' button[type="submit"]'; // ID of the input field for the second search text const qrySelector = "#qry"; // ID of the select box with the filter query key @@ -319,52 +321,86 @@ // Changes in the select box for the filter query $(selectMods).change(() => { - setFQAndCondQueryElementsValues(); + setFQAndCondQueryElementsValues('selectMods'); }); // Changes in the input field of the filter query $(qrySelector).change(() => { - setFQAndCondQueryElementsValues(); + setFQAndCondQueryElementsValues('changeQry'); + }); + + // Key up changes in the second search input element + $(qrySelector).keyup(() => { + if ($(selectMods)) { + const queryText = $(qrySelector).val().trim(); + const selectModsValue = $(selectMods).val(); + // Case if selectMods is 'all' - 'everything' + if (selectModsValue !== 'all') { + if (queryText !== '') { + // Enable the submit button in the second search form + enableButton(secondSearchFormSubmitButtonElement); + } else { + // Disable the submit button in the second search form + disableButton(secondSearchFormSubmitButtonElement); + } + } + } }); // Changes for the fq element and condQuery element - function setFQAndCondQueryElementsValues() { + function setFQAndCondQueryElementsValues(eventType = 'selectMods') { if ($(selectMods) && $(qrySelector) && $(fqElement) && $(initialCondQuerySecond) && $(condQuery)) { let queryText = ''; - if ($(qrySelector).val() !== '') { - queryText = $(qrySelector).val().trim(); - // Remove all duplicate spaces, tabs, newlines etc - queryText = queryText.replace(/\s\s+/g, ' '); - } - + queryText = $(qrySelector).val().trim(); + // Remove all duplicate spaces, tabs, newlines etc + queryText = queryText.replace(/\s\s+/g, ' '); const initialCondQueryValue = $(initialCondQuerySecond).val().trim(); - const selectModsValue = $(selectMods).val(); // Case if selectMods is 'all' - 'everything' if (selectModsValue === 'all') { $(fqElement).attr('value', ''); let condQueryValue = initialCondQueryValue; if (initialCondQueryValue !== '') { - if (queryText !== '') { - condQueryValue += ' AND ' + queryText; - } + condQueryValue += ' AND ' + queryText; } else { - if (queryText !== '') { - condQueryValue += queryText; - } + condQueryValue += queryText; } $(condQuery).attr('value', condQueryValue); + if (eventType === 'selectMods') { + // Enable the submit button in the second search form + enableButton(secondSearchFormSubmitButtonElement); + } } else { - if (queryText !== '') { - // const selectModsValue = $(selectMods).val(); - const filterQuery = selectModsValue + ':' + queryText; - $(fqElement).attr('value', filterQuery); - $(condQuery).attr('value', initialCondQueryValue); + const filterQuery = selectModsValue + ':' + queryText; + $(fqElement).attr('value', filterQuery); + $(condQuery).attr('value', initialCondQueryValue); + if (eventType === 'selectMods') { + if (queryText !== '') { + // Enable the submit button in the second search form + enableButton(secondSearchFormSubmitButtonElement); + } else { + // Disable the submit button in the second search form + disableButton(secondSearchFormSubmitButtonElement); + } } } } } + // Disable the button + function disableButton(element) { + if (element) { + $(element).attr('disabled','disabled'); + } + } + + // Enable the button + function enableButton(element) { + if (element) { + $(element).removeAttr('disabled'); + } + } + var languageList = jQuery('#topnav .languageList'); jQuery('#topnav .languageSelect').click(function() { languageList.toggleClass('hide'); From 00d4adb7edeebafdfaac4802e9d23e9a38da93df Mon Sep 17 00:00:00 2001 From: Oleksiy 'Alex' Levshyn Date: Tue, 19 Nov 2024 09:15:03 +0100 Subject: [PATCH 05/14] MIR-1362 fix empty fq and queries with more than one word --- .../META-INF/resources/js/mir/base.js | 11 +++++--- .../src/main/resources/xsl/response-mir.xsl | 25 ++++++++----------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js index 2508f0e449..e148cb6f48 100644 --- a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js +++ b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js @@ -360,8 +360,8 @@ if (selectModsValue === 'all') { $(fqElement).attr('value', ''); let condQueryValue = initialCondQueryValue; - if (initialCondQueryValue !== '') { - condQueryValue += ' AND ' + queryText; + if (queryText !== '') { + condQueryValue += ' AND ' + preparingQueryStringForSolr(queryText); } else { condQueryValue += queryText; } @@ -371,7 +371,7 @@ enableButton(secondSearchFormSubmitButtonElement); } } else { - const filterQuery = selectModsValue + ':' + queryText; + const filterQuery = selectModsValue + ':' + preparingQueryStringForSolr(queryText); $(fqElement).attr('value', filterQuery); $(condQuery).attr('value', initialCondQueryValue); if (eventType === 'selectMods') { @@ -387,6 +387,11 @@ } } + // Add special characters to the query string for the SOLR request and remove all quotes from the query string + function preparingQueryStringForSolr(queryStr) { + return queryStr ? '"' + queryStr.replace(/"|%22/g, '') + '"' : queryStr; + } + // Disable the button function disableButton(element) { if (element) { diff --git a/mir-module/src/main/resources/xsl/response-mir.xsl b/mir-module/src/main/resources/xsl/response-mir.xsl index 8b89f46518..34addf8bf9 100644 --- a/mir-module/src/main/resources/xsl/response-mir.xsl +++ b/mir-module/src/main/resources/xsl/response-mir.xsl @@ -62,16 +62,7 @@
- - - - - - - - - - + @@ -85,7 +76,6 @@ - @@ -209,7 +199,7 @@ - + @@ -236,6 +226,9 @@ + + + @@ -259,9 +252,9 @@ - + - + @@ -275,8 +268,10 @@ + + - + From cbc0ca0b6487a49ca10b298252a2ff61a6b7fff4 Mon Sep 17 00:00:00 2001 From: Oleksiy 'Alex' Levshyn Date: Tue, 19 Nov 2024 13:21:54 +0100 Subject: [PATCH 06/14] MIR-1362 fix empty request in the the main search --- .../src/main/resources/xsl/mir-flatmir-layout-utils.xsl | 2 +- .../src/main/resources/META-INF/resources/js/mir/base.js | 6 +++++- mir-module/src/main/resources/xsl/response-mir.xsl | 9 ++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl b/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl index 4c3886ac5f..e22c9f15ab 100644 --- a/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl +++ b/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl @@ -73,7 +73,7 @@ id="searchInput" type="text" aria-label="Search" /> - + diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js index e148cb6f48..2b1cda8596 100644 --- a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js +++ b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js @@ -315,7 +315,11 @@ // Input element's changes in the original search $(originalSearchInputElement).change(() => { if ($(initialCondQueryFirst)) { - $(initialCondQueryFirst).attr('value', $('#searchInput').val().trim()); + let initialCondQueryValue = $(originalSearchInputElement).val().trim(); + if (initialCondQueryValue === '') { + initialCondQueryValue = '*'; + } + $(initialCondQueryFirst).attr('value', initialCondQueryValue); } }); diff --git a/mir-module/src/main/resources/xsl/response-mir.xsl b/mir-module/src/main/resources/xsl/response-mir.xsl index 34addf8bf9..2210c5fb58 100644 --- a/mir-module/src/main/resources/xsl/response-mir.xsl +++ b/mir-module/src/main/resources/xsl/response-mir.xsl @@ -254,7 +254,14 @@ - + + + + + + + + From f6f7071d47a1801c58c4076cc323c830cd2195a8 Mon Sep 17 00:00:00 2001 From: Oleksiy 'Alex' Levshyn Date: Tue, 19 Nov 2024 13:52:06 +0100 Subject: [PATCH 07/14] MIR-1362 fix the query with the servlets/solr/select path --- .../resources/META-INF/resources/js/mir/base.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js index 2b1cda8596..31ce47b311 100644 --- a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js +++ b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js @@ -410,6 +410,23 @@ } } + // Check the SOLR request after submitting + $(subSearchFormName).submit(() => { + let originalSearchAction = $(subSearchFormName).attr('action'); + // If the request not for 'find' but 'select' + if (!originalSearchAction.includes('servlets/solr/find')) { + let condQueryValue = '*'; + if (condQuery && ($(condQuery).val().trim() !== '')) { + condQueryValue = $(condQuery).val().trim(); + } + let qQueryParameterElement = document.createElement("input"); + qQueryParameterElement.setAttribute('type', 'hidden'); + qQueryParameterElement.setAttribute('name', 'q'); + qQueryParameterElement.setAttribute('value', condQueryValue); + document.querySelector(subSearchFormName).appendChild(qQueryParameterElement); + } + }); + var languageList = jQuery('#topnav .languageList'); jQuery('#topnav .languageSelect').click(function() { languageList.toggleClass('hide'); From 54a16f5437d85d17791aa2f854f174061d2057dd Mon Sep 17 00:00:00 2001 From: Oleksiy 'Alex' Levshyn Date: Wed, 20 Nov 2024 08:57:32 +0100 Subject: [PATCH 08/14] fix form for the case with solr/select --- .../META-INF/resources/js/mir/base.js | 17 ----- .../src/main/resources/xsl/response-mir.xsl | 64 ++++++++++++++++--- 2 files changed, 54 insertions(+), 27 deletions(-) diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js index 31ce47b311..2b1cda8596 100644 --- a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js +++ b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js @@ -410,23 +410,6 @@ } } - // Check the SOLR request after submitting - $(subSearchFormName).submit(() => { - let originalSearchAction = $(subSearchFormName).attr('action'); - // If the request not for 'find' but 'select' - if (!originalSearchAction.includes('servlets/solr/find')) { - let condQueryValue = '*'; - if (condQuery && ($(condQuery).val().trim() !== '')) { - condQueryValue = $(condQuery).val().trim(); - } - let qQueryParameterElement = document.createElement("input"); - qQueryParameterElement.setAttribute('type', 'hidden'); - qQueryParameterElement.setAttribute('name', 'q'); - qQueryParameterElement.setAttribute('value', condQueryValue); - document.querySelector(subSearchFormName).appendChild(qQueryParameterElement); - } - }); - var languageList = jQuery('#topnav .languageList'); jQuery('#topnav .languageSelect').click(function() { languageList.toggleClass('hide'); diff --git a/mir-module/src/main/resources/xsl/response-mir.xsl b/mir-module/src/main/resources/xsl/response-mir.xsl index 2210c5fb58..52e77914d3 100644 --- a/mir-module/src/main/resources/xsl/response-mir.xsl +++ b/mir-module/src/main/resources/xsl/response-mir.xsl @@ -179,8 +179,9 @@ - - + + + @@ -248,16 +249,59 @@ - + + <!– If $lastTypeRequest is 'condQuery', concatenate $initialCondQuery, ' AND ' and $currentQry –> + + + + + + + + + + + <!– If $lastTypeRequest is 'fq' or empty, use $initialCondQuery –> + + + + <!– Default case (if needed, though not specified in your conditions) –> + + + + + + --> + + + + + + + + + + + + + + + + + + + + + + @@ -267,7 +311,7 @@ - + @@ -280,11 +324,11 @@ - - - - - + + + + + diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js index 54b8be29b0..68bb18336b 100644 --- a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js +++ b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js @@ -305,8 +305,6 @@ const selectMods = "#select_mods"; // ID of the hidden element with the fq parameter const fqElement = "#fq"; - // ID of the hidden element with the initial condQuery parameter in the mir-cosmol-layout-utils.xsl search form - const initialCondQueryMirCosmolLayout = "#initialCondQueryMirCosmolLayout"; // ID of the hidden element with the initial condQuery parameter in the mir-flatmir-layout-utils.xsl search form const initialCondQueryMirFlatmirLayout = "#initialCondQueryMirFlatmirLayout"; // ID of the hidden element with the initial condQuery parameter in the second search form From 7ebb2556351846426b56d682ccc432cc98ba952d Mon Sep 17 00:00:00 2001 From: Oleksiy 'Alex' Levshyn Date: Wed, 18 Dec 2024 13:04:27 +0100 Subject: [PATCH 12/14] MIR-1362 add wrapper with css classes to the select box --- .../src/main/resources/xsl/response-mir.xsl | 102 +++++++++--------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/mir-module/src/main/resources/xsl/response-mir.xsl b/mir-module/src/main/resources/xsl/response-mir.xsl index 75828c26c8..79344570c1 100644 --- a/mir-module/src/main/resources/xsl/response-mir.xsl +++ b/mir-module/src/main/resources/xsl/response-mir.xsl @@ -152,56 +152,58 @@
- +
+ +
From 188de57ce19c61a44b04bd877dc00341273990e9 Mon Sep 17 00:00:00 2001 From: Oleksiy 'Alex' Levshyn Date: Wed, 8 Jan 2025 09:00:43 +0100 Subject: [PATCH 13/14] MIR-1362 revert to modified bootstrap dropdown element instead of select box in secondary search --- .../META-INF/resources/js/mir/base.js | 19 ++- .../src/main/resources/xsl/response-mir.xsl | 122 ++++++++++-------- 2 files changed, 85 insertions(+), 56 deletions(-) diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js index 68bb18336b..733a046974 100644 --- a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js +++ b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js @@ -301,8 +301,12 @@ const secondSearchFormSubmitButtonElement = subSearchFormName + ' button[type="submit"]'; // ID of the input field for the second search text const qrySelector = "#qry"; - // ID of the select box with the filter query key + // ID of the dropdown element with the filter query key const selectMods = "#select_mods"; + // ID of the dropdown element with the filter query key + const selectModsLabel = "#select_mods_label"; + // Selector of a dropdown-menu item + const selectModsItem = ".select_mods_type .dropdown-item"; // ID of the hidden element with the fq parameter const fqElement = "#fq"; // ID of the hidden element with the initial condQuery parameter in the mir-flatmir-layout-utils.xsl search form @@ -323,9 +327,18 @@ } }); - // Changes in the select box for the filter query - $(selectMods).change(() => { + // Select one of the dropdown-menu items + $(selectModsItem).click(function() { + if ($(selectModsLabel).length) { + // Change the dropdowns label + $(selectModsLabel).html( $( this ).html() ); + } + if ($(selectMods).length) { + // Change the dropdowns value + $(selectMods).attr( 'value', $( this ).attr('value') ); + setFQAndCondQueryElementsValues('selectMods'); + } }); // Changes in the input field of the filter query diff --git a/mir-module/src/main/resources/xsl/response-mir.xsl b/mir-module/src/main/resources/xsl/response-mir.xsl index 79344570c1..b9ddd7e656 100644 --- a/mir-module/src/main/resources/xsl/response-mir.xsl +++ b/mir-module/src/main/resources/xsl/response-mir.xsl @@ -94,7 +94,7 @@ - + @@ -108,12 +108,12 @@ - + - + @@ -151,58 +151,74 @@
- +
- + + + +
From 842183a85954cd943100969660618ea3c08e35da Mon Sep 17 00:00:00 2001 From: Oleksiy 'Alex' Levshyn Date: Wed, 8 Jan 2025 09:08:05 +0100 Subject: [PATCH 14/14] MIR-1362 revert to test of the dropdown element --- .../it/controller/MIRSearchController.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/mir-it/src/test/java/org/mycore/mir/it/controller/MIRSearchController.java b/mir-it/src/test/java/org/mycore/mir/it/controller/MIRSearchController.java index 0b6e70d4b8..cd5b830e77 100644 --- a/mir-it/src/test/java/org/mycore/mir/it/controller/MIRSearchController.java +++ b/mir-it/src/test/java/org/mycore/mir/it/controller/MIRSearchController.java @@ -179,43 +179,50 @@ public void searchByPublication(String title, String subTitle, String author, St // select mods (filter query) is 'all' if (title != null) { - new Select(driver.waitAndFindElement(By.id("select_mods"))).selectByValue("all"); + driver.waitAndFindElement(By.id("search_type_label")).click(); + driver.waitAndFindElement(MCRBy.partialLinkText("Alles")).click(); qry(title); } // select mods (filter query) is 'mods.title' if (subTitle != null) { - new Select(driver.waitAndFindElement(By.id("select_mods"))).selectByValue("mods.title"); + driver.waitAndFindElement(By.id("search_type_label")).click(); + driver.waitAndFindElement(MCRBy.partialLinkText("Titel")).click(); qry(subTitle); } // select mods (filter query) is 'mods.author' if (author != null) { - new Select(driver.waitAndFindElement(By.id("select_mods"))).selectByValue("mods.author"); + driver.waitAndFindElement(By.id("search_type_label")).click(); + driver.waitAndFindElement(MCRBy.partialLinkText("Autor")).click(); qry(author); } // select mods (filter query) is 'mods.name.top' if (name != null) { - new Select(driver.waitAndFindElement(By.id("select_mods"))).selectByValue("mods.name.top"); + driver.waitAndFindElement(By.id("search_type_label")).click(); + driver.waitAndFindElement(MCRBy.partialLinkText("Name")).click(); qry(name); } // select mods (filter query) is 'mods.nameIdentifier' if (nameIdentifier != null) { - new Select(driver.waitAndFindElement(By.id("select_mods"))).selectByValue("mods.nameIdentifier"); + driver.waitAndFindElement(By.id("search_type_label")).click(); + driver.waitAndFindElement(MCRBy.partialLinkText("Namens Identifikator")).click(); qry(nameIdentifier); } // select mods (filter query) is 'allMeta' if (metadata != null) { - new Select(driver.waitAndFindElement(By.id("select_mods"))).selectByValue("allMeta"); + driver.waitAndFindElement(By.id("search_type_label")).click(); + driver.waitAndFindElement(MCRBy.partialLinkText("Alle Metadaten")).click(); qry(metadata); } // select mods (filter query) is 'content' if (content != null) { - new Select(driver.waitAndFindElement(By.id("select_mods"))).selectByValue("content"); + driver.waitAndFindElement(By.id("search_type_label")).click(); + driver.waitAndFindElement(MCRBy.partialLinkText("Volltext")).click(); qry(content); }