From 2f074dc95093a4e61028319281fb3e77c793016a Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Wed, 21 Jan 2026 21:50:56 -0800 Subject: [PATCH 1/2] Fix failure in PanoramaWebPublicSearchTest due to invalid URL parameters --- .../view/search/panoramaWebSearch.jsp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaWebSearch.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaWebSearch.jsp index ad5ff6f1..a307f007 100644 --- a/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaWebSearch.jsp +++ b/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaWebSearch.jsp @@ -361,21 +361,26 @@ let instrument = document.getElementById(instrumentItemId).value; let expSearchParams = ""; + let separator = ""; if (author) { expAnnotationFilters.push(createFilter(authorsItemId, author)); - expSearchParams += "Targeted MS Experiment List." + "authors~containsoneof" + "=" + encodeURIComponent(author) + "&"; + expSearchParams += separator + "Targeted MS Experiment List." + "authors~containsoneof=" + encodeURIComponent(author); + separator = "&"; } if (title) { expAnnotationFilters.push(createFilter(titleItemId, title)); - expSearchParams += "Targeted MS Experiment List." + "title~containsoneof" + "=" + encodeURIComponent(title) + "&"; + expSearchParams += separator + "Targeted MS Experiment List." + "title~containsoneof=" + encodeURIComponent(title); + separator = "&"; } if (organism) { expAnnotationFilters.push(createFilter(organismItemId, organism)); - expSearchParams += "Targeted MS Experiment List." + "organism~containsoneof" + "=" + encodeURIComponent(organism.replaceAll(",", ";")) + "&"; + expSearchParams += separator + "Targeted MS Experiment List." + "organism~containsoneof=" + encodeURIComponent(organism.replaceAll(",", ";")); + separator = "&"; } if (instrument) { expAnnotationFilters.push(createFilter(instrumentItemId, instrument)); - expSearchParams += "Targeted MS Experiment List." + "instrument~containsoneof" + "=" + encodeURIComponent(instrument.replaceAll(",", ";")); + expSearchParams += separator + "Targeted MS Experiment List." + "instrument~containsoneof" + "=" + encodeURIComponent(instrument.replaceAll(",", ";")); + separator = "&"; } if (expSearchParams !== "") { location.replace(window.location.href + "?" + expSearchParams); @@ -494,6 +499,7 @@ ]; } + debugger; let wp = new LABKEY.QueryWebPart({ renderTo: 'webpart_'+ expWebpart[0].webPartId, title: 'Panorama Public Experiments', From 81948d3a3c52ba621a3655f91a3e9d1f02ed9d13 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Thu, 22 Jan 2026 08:14:30 -0800 Subject: [PATCH 2/2] Remove debugging code --- .../org/labkey/panoramapublic/view/search/panoramaWebSearch.jsp | 1 - 1 file changed, 1 deletion(-) diff --git a/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaWebSearch.jsp b/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaWebSearch.jsp index a307f007..1727d306 100644 --- a/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaWebSearch.jsp +++ b/panoramapublic/src/org/labkey/panoramapublic/view/search/panoramaWebSearch.jsp @@ -499,7 +499,6 @@ ]; } - debugger; let wp = new LABKEY.QueryWebPart({ renderTo: 'webpart_'+ expWebpart[0].webPartId, title: 'Panorama Public Experiments',