From 85bdf6eee06eccc8880ca3677e8151f90a079f6b Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Tue, 4 Mar 2025 14:02:36 -0600
Subject: [PATCH] Issue 52461: Luminex Levey-Jennings report 4PL curve fit
 comparison report not working for assay run selected from another folder -
 add LABKEY.Query.containerFilter.allFolders to selectRows request in
 viewCurvesClicked()

---
 .../labkey/test/tests/luminex/LuminexGuideSetTest.java   | 6 ++++++
 .../src/org/labkey/test/tests/luminex/LuminexTest.java   | 9 +++++++--
 luminex/webapp/luminex/LeveyJenningsTrackingDataPanel.js | 5 +++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/luminex/test/src/org/labkey/test/tests/luminex/LuminexGuideSetTest.java b/luminex/test/src/org/labkey/test/tests/luminex/LuminexGuideSetTest.java
index 38624ea7c3..34355eaf32 100644
--- a/luminex/test/src/org/labkey/test/tests/luminex/LuminexGuideSetTest.java
+++ b/luminex/test/src/org/labkey/test/tests/luminex/LuminexGuideSetTest.java
@@ -384,6 +384,10 @@ private void verifyGuideSetThresholds(Map<String, Integer> guideSetIds, String[]
     @LogMethod
     private void verifyLeveyJenningsPlots()
     {
+        // Issue 52461: view the LJ report and curve fit comparison plots from subfolder
+        goToProjectFolder(getProjectName(), TEST_ASSAY_SUBFOLDER);
+        clickAndWait(Locator.linkWithText(TEST_ASSAY_LUM));
+
         _guideSetHelper.goToLeveyJenningsGraphPage(TEST_ASSAY_LUM, "Standard1");
         _guideSetHelper.setUpLeveyJenningsGraphParams("GS Analyte B");
 
@@ -434,6 +438,8 @@ private void verifyLeveyJenningsPlots()
         selectCurveComparisonPlotOption("curvecomparison-legend-combo", "Notebook No.");
         Locator.extButton("Close").findElement(curveComparisonWindow).click();
         _extHelper.waitForExt3MaskToDisappear(WAIT_FOR_JAVASCRIPT);
+
+        goToProjectHome();
     }
 
     private void selectCurveComparisonPlotOption(String comboName, String value)
diff --git a/luminex/test/src/org/labkey/test/tests/luminex/LuminexTest.java b/luminex/test/src/org/labkey/test/tests/luminex/LuminexTest.java
index c78773594f..9291f5f47d 100644
--- a/luminex/test/src/org/labkey/test/tests/luminex/LuminexTest.java
+++ b/luminex/test/src/org/labkey/test/tests/luminex/LuminexTest.java
@@ -64,7 +64,8 @@
 @BaseWebDriverTest.ClassTimeout(minutes = 40)
 public abstract class LuminexTest extends BaseWebDriverTest
 {
-    protected final static String TEST_ASSAY_PRJ_LUMINEX = "LuminexTest Project";            //project for luminex test
+    protected final static String TEST_ASSAY_PRJ_LUMINEX = "LuminexTest Project";
+    protected final static String TEST_ASSAY_SUBFOLDER = "Subfolder";//project for luminex test
 
     public static final String TEST_ASSAY_LUM =  "&TestAssayLuminex></% 1";// put back TRICKY_CHARACTERS_NO_QUOTES when issue 20061 is resolved
     protected static final String TEST_ASSAY_LUM_DESC = "Description for Luminex assay";
@@ -181,6 +182,10 @@ private void doInit() throws Exception
             goToProjectHome();
         }
 
+        // create a subfolder to the project
+        _containerHelper.createSubfolder(getProjectName(), TEST_ASSAY_SUBFOLDER, "Assay");
+        goToProjectHome();
+
         PortalHelper portalHelper = new PortalHelper(this);
         //add the Assay List web part so we can create a new luminex assay
         portalHelper.addWebPart("Assay List");
@@ -575,7 +580,7 @@ protected void doCleanup(boolean afterTest) throws TestTimeoutException
     //helper function to go to test assay home from anywhere the project link is visible
     public void goToTestAssayHome(String assayName)
     {
-        if (!isTextPresent(assayName + " Runs"))
+        if (!getDriver().getTitle().startsWith(assayName + " Runs"))
         {
             goToProjectHome();
             clickAndWait(Locator.linkWithText(assayName));
diff --git a/luminex/webapp/luminex/LeveyJenningsTrackingDataPanel.js b/luminex/webapp/luminex/LeveyJenningsTrackingDataPanel.js
index 66f4156a6e..a67cc06440 100644
--- a/luminex/webapp/luminex/LeveyJenningsTrackingDataPanel.js
+++ b/luminex/webapp/luminex/LeveyJenningsTrackingDataPanel.js
@@ -257,6 +257,7 @@ LABKEY.LeveyJenningsTrackingDataPanel = Ext.extend(Ext.Component, {
                     queryName: this.controlType === 'SinglePoint' ? 'AnalyteSinglePointControl' : 'AnalyteTitration',
                     columns: 'Analyte/Data/Run/RowId',
                     filterArray: [LABKEY.Filter.create('Analyte', analyteIds, LABKEY.Filter.Types.IN)],
+                    containerFilter: LABKEY.Query.containerFilter.allFolders,
                     success: function(data) {
                         var runIds = [];
                         for (var i = 0; i < data.rows.length; i++) {
@@ -457,11 +458,11 @@ LABKEY.LeveyJenningsTrackingDataPanel = Ext.extend(Ext.Component, {
                     if (Ext.getDom(divId)) {
                         var html = Ext.getDom(divId).innerHTML;
                         html = html.replace(/&amp;/g, "&");
-                        var pdfHref = html.substring(html.indexOf('href="') + 6, html.indexOf('&attachment=true'));
+                        var pdfHref = html.substring(html.indexOf('href="') + 6, html.indexOf('Curve Comparison Plot.pdf') - 2);
                         if (pdfHref.indexOf("deleteFile") == -1) {
                             pdfHref = pdfHref + "&deleteFile=false";
                         }
-                        window.location = pdfHref + "&attachment=true";
+                        window.location = pdfHref;
                     }
                 }
             },