Merge branch 'develop' into fb_53306_propertyName

Author: labkey-jeckels

data/api/rlabkey-api-experiment.xml

@@ -285,7 +285,7 @@
             <![CDATA[
                 Rows via createAndLoad = 3
                 Rows via insert = 2
-                duplicate key
+                already exists
                 Rows via merge = 10
                 Has audit transaction id = TRUE
              ]]>

src/org/labkey/test/BaseWebDriverTest.java

@@ -216,8 +216,6 @@ public abstract class BaseWebDriverTest extends LabKeySiteWrapper implements Cle
 
     public static final double DELTA = 10E-10;
 
-    @Deprecated // Going away soon
-    public static final String[] ILLEGAL_QUERY_KEY_CHARACTERS = FieldKey.getIllegalChars().toArray(new String[0]);
     public static final String ALL_ILLEGAL_QUERY_KEY_CHARACTERS = StringUtils.join(FieldKey.getIllegalChars(), "");
     // See TSVWriter.shouldQuote. Generally we are not able to use the tab and new line characters when creating field names in the UI, but including here for completeness
     public static final String[] TRICKY_IMPORT_FIELD_CHARACTERS = {"\\", "\"", "\\t", ",", "\\n", "\\r"};
@@ -300,7 +298,7 @@ public WebDriver getWrappedDriver()
         return SingletonWebDriver.getInstance().getWebDriver();
     }
 
-    protected abstract @Nullable String getProjectName();
+    protected abstract String getProjectName();
 
     public final @Nullable String getPrimaryTestProject()
     {

src/org/labkey/test/components/ui/grids/EditableGrid.java

@@ -44,6 +44,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.TimeZone;
 import java.util.function.Function;
@@ -1114,6 +1115,20 @@ public String getCellError(int row, CharSequence columnIdentifier)
         return null;
     }
 
+    /**
+     * @param row row index
+     * @param columnIdentifier fieldKey, name, or label of column
+     * @return error popover text in the specified cell or 'null' if there is no error
+     */
+    public String getErrorPopoverText(int row, CharSequence columnIdentifier)
+    {
+        WebElement gridCell = getCell(row, columnIdentifier);
+
+        if (cellHasError(gridCell))
+            return getCellPopoverText(row, columnIdentifier);
+        return null;
+    }
+
     /**
      * @param row row index
      * @param columnIdentifier fieldKey, name, or label of column
@@ -1123,11 +1138,17 @@ public String getCellPopoverText(int row, CharSequence columnIdentifier)
     {
         WebElement cellDiv = Locator.tagWithClass("div", "cellular-display").findElement(getCell(row, columnIdentifier));
         getWrapper().mouseOver(cellDiv);   // cause the tooltip to be present
-        if (WebDriverWrapper.waitFor(()-> null != Locator.byClass("popover").findElementOrNull(getDriver()), 1000))
-        {
-            return Locator.byClass("popover").findElement(getDriver()).getText();
-        }
-        return null;
+        return Optional.ofNullable(WebDriverWrapper.waitFor(()-> Locators.popover.findElementOrNull(getDriver()), 1000))
+            .map(WebElement::getText)
+            .orElse(null);
+    }
+
+    public void dismissPopover()
+    {
+        Locators.popover.findOptionalElement(getDriver()).ifPresent(popover -> {
+            getWrapper().mouseOut();
+            getWrapper().shortWait().until(ExpectedConditions.invisibilityOf(popover));
+        });
     }
 
     public List<WebElement> getCellErrors()
@@ -1286,6 +1307,7 @@ private Locators()
         static final Locator.XPathLocator rows = Locator.tag("tbody").childTag("tr").withoutClass("grid-empty").withoutClass("grid-loading");
         static final Locator headerCells = Locator.css("thead tr th");
         static final Locator inputCell = Locator.css(".eg-input-cell");
+        static final Locator popover = Locator.byClass("popover");
     }
 
     public static class EditableGridFinder extends WebDriverComponent.WebDriverComponentFinder<EditableGrid, EditableGridFinder>

src/org/labkey/test/components/ui/grids/GridFilterModal.java

@@ -7,7 +7,9 @@
 import org.labkey.test.components.react.Tabs;
 import org.labkey.test.components.ui.search.FilterExpressionPanel;
 import org.labkey.test.components.ui.search.FilterFacetedPanel;
+import org.labkey.test.params.WrapsFieldKey;
 import org.labkey.test.util.selenium.WebElementUtils;
+import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedConditions;
@@ -36,12 +38,13 @@ protected void waitForReady()
 
     /**
      * Select field to configure filters for
-     * @param fieldLabel Field's label
+     * @param fieldIdentifier fieldKey or field label
      * @return this component
      */
-    public GridFilterModal selectField(String fieldLabel)
+    public GridFilterModal selectField(CharSequence fieldIdentifier)
     {
-        WebElement fieldItem = elementCache().findFieldOption(fieldLabel);
+        WebElement fieldItem = elementCache().findFieldOption(fieldIdentifier);
+        String fieldLabel = WebElementUtils.getTextContent(fieldItem);
         fieldItem.click();
         Locator.byClass("field-modal__col-sub-title").withText("Find values for " + fieldLabel)
                 .waitForElement(elementCache().filterPanel, 10_000);
@@ -182,15 +185,25 @@ protected ElementCache newElementCache()
 
     protected class ElementCache extends ModalDialog.ElementCache
     {
-        public final Locator listItemLoc = Locator.byClass("list-group-item");
+        public final Locator.XPathLocator listItemLoc = Locator.byClass("list-group-item");
 
         // Fields column
         public final WebElement fieldsSelectionPanel = Locator.byClass("filter-modal__col_fields")
                 .findWhenNeeded(this);
 
-        protected WebElement findFieldOption(String queryName)
+        protected WebElement findFieldOption(CharSequence queryName)
         {
-            return listItemLoc.withText(queryName).findElement(elementCache().fieldsSelectionPanel);
+            try
+            {
+                return listItemLoc.withChild(Locator.tagWithAttribute("span", "data-fieldkey", queryName.toString())).findElement(fieldsSelectionPanel);
+            }
+            catch (NoSuchElementException nse)
+            {
+                if (!(queryName instanceof WrapsFieldKey))
+                    return listItemLoc.withText(queryName.toString()).findElement(elementCache().fieldsSelectionPanel);
+                else
+                    throw nse;
+            }
         }
         protected List<WebElement> findFieldOptions()
         {

src/org/labkey/test/components/ui/grids/ResponsiveGrid.java

@@ -27,6 +27,7 @@
 import org.openqa.selenium.support.ui.ExpectedConditions;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -449,6 +450,17 @@ public T selectRows(CharSequence columnIdentifier, Collection<String> texts, boo
         return getThis();
     }
 
+    /**
+     * Checks the specified rows' selector checkboxes
+     * @param columnIdentifier fieldKey, name, or label of column
+     * @param texts         Text to search for in the specified column
+     * @return this grid
+     */
+    public T selectRows(CharSequence columnIdentifier, String... texts)
+    {
+        return selectRows(columnIdentifier, Arrays.asList(texts), true);
+    }
+
     /**
      * Is the row at the selected index selected
      * @param index Row index (zero-based)

src/org/labkey/test/tests/AdminConsoleNavigationTest.java

@@ -1,5 +1,6 @@
 package org.labkey.test.tests;
 
+import org.assertj.core.api.Assertions;
 import org.jetbrains.annotations.Nullable;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -86,6 +87,7 @@ public void testAdminNavTrails()
         {
             linkHrefs.put(link.getText(), link.getAttribute("href"));
         }
+        Assertions.assertThat(linkHrefs.keySet()).as("Expected links").containsAll(ignoredLinks.stream().map(String::toUpperCase).toList());
 
         List<String> pagesMissingNavTrail = new ArrayList<>();
 
@@ -121,6 +123,7 @@ public void testTroubleshooterLinkAccess()
         impersonate(TROUBLESHOOTER);
         Map<String, String> linkHrefs = new LinkedHashMap<>();
         List<WebElement> troubleshooterLinks = adminConsole.getAllAdminConsoleLinks();
+        assertTrue(String.format("Failed sanity check. Only found %s admin links. There should be more.", troubleshooterLinks.size()), troubleshooterLinks.size() > 10);
         for (WebElement link : troubleshooterLinks)
             linkHrefs.put(link.getText(), link.getAttribute("href"));
 
@@ -155,6 +158,7 @@ public void testAdminConsoleLinksForAdminAndNonAdmin()
         ));
         ShowAdminPage adminConsole = goToAdminConsole();
         List<WebElement> adminLinks = adminConsole.getAllAdminConsoleLinks();
+        assertTrue(String.format("Failed sanity check. Only found %s admin links. There should be more.", adminLinks.size()), adminLinks.size() > 10);
         Map<String, String> linkHrefs = new LinkedHashMap<>();
         for (WebElement link : adminLinks)
             linkHrefs.put(link.getText(), link.getAttribute("href"));

src/org/labkey/test/tests/CrawlerTest.java

@@ -1,11 +1,13 @@
 package org.labkey.test.tests;
 
+import org.assertj.core.api.Assertions;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.labkey.remoteapi.SimpleGetCommand;
 import org.labkey.test.BaseWebDriverTest;
 import org.labkey.test.Locator;
 import org.labkey.test.Locators;
@@ -117,18 +119,25 @@ public void testEnforceCsp() throws Exception
         beginAt(getInjectUrl(Crawler.injectScriptBlock), 10_000);
 
         log("Verify that enforced CSP is also reported");
-        CspLogUtil.checkNewCspWarnings(getArtifactCollector());
+        CspLogUtil.checkNewCspWarnings(getArtifactCollector()); // throws CspWarningDetectedException
     }
 
     @Test (expected = CspLogUtil.CspWarningDetectedException.class)
-    public void testCspWarning()
+    public void testCspWarning() throws Exception
     {
         Assume.assumeFalse("Can't test for CSP report", TestProperties.isCspCheckSkipped());
 
         _cspConfigHelper.setEnforceCsp(false);
 
-        beginAt(WebTestHelper.buildRelativeUrl(MODULE_NAME, getProjectName(), "cspWarning"));
-        CspLogUtil.checkNewCspWarnings(getArtifactCollector());
+        int initialLength = getCspReportLog().length();
+
+        String cspWarningUrl = WebTestHelper.buildRelativeUrl(MODULE_NAME, getProjectName(), "cspWarning");
+        beginAt(cspWarningUrl);
+
+        // 53261: Provide visibility into CSP reports for cloud clients
+        Assertions.assertThat(getCspReportLog().substring(initialLength)).as("CSP warning").contains(cspWarningUrl);
+
+        CspLogUtil.checkNewCspWarnings(getArtifactCollector()); // throws CspWarningDetectedException
     }
 
     // Crawler should flag external links without the correct 'rel' attribute
@@ -188,6 +197,13 @@ protected boolean cspFailFast()
         return false;
     }
 
+    public String getCspReportLog() throws Exception
+    {
+        return new SimpleGetCommand("admin", "showCspReportLog")
+            .execute(createDefaultConnection(), null)
+            .getText();
+    }
+
     @After
     public void postTest()
     {

src/org/labkey/test/tests/SampleTypeFolderExportImportTest.java

@@ -43,6 +43,7 @@
 import org.labkey.test.params.FieldDefinition;
 import org.labkey.test.params.experiment.DataClassDefinition;
 import org.labkey.test.params.experiment.SampleTypeDefinition;
+import org.labkey.test.util.ArtifactCollector;
 import org.labkey.test.util.DataRegionTable;
 import org.labkey.test.util.LogMethod;
 import org.labkey.test.util.PortalHelper;
@@ -546,7 +547,7 @@ public void testExportImportSampleTypesWithAssayRuns() throws Exception
     {
         String subfolder = "samplesWithAssayRunsFolder";
         String subfolderPath = getProjectName() + "/" + subfolder;
-        String testSamples = "testSamples";
+        String testSamples = "testSamplesWithFiles";
         String assayName = "testAssay";
         String importFolder = "assaySamplesImportFolder";
 
@@ -557,7 +558,7 @@ public void testExportImportSampleTypesWithAssayRuns() throws Exception
         // create a test sampleType
         List<FieldDefinition> testFields = SampleTypeAPIHelper.sampleTypeTestFields(true);
         SampleTypeDefinition testSampleType = new SampleTypeDefinition(testSamples).setFields(testFields)
-                .addParentAlias("SelfParent"); // to derive from samles in the current type
+                .addParentAlias("SelfParent"); // to derive from samples in the current type
 
         TestDataGenerator parentDgen = SampleTypeAPIHelper.createEmptySampleType(subfolderPath, testSampleType);
         parentDgen.addCustomRow(Map.of("Name", "sample1", "intColumn", 1, "decimalColumn", 1.1, "stringColumn", "one"));
@@ -572,14 +573,23 @@ public void testExportImportSampleTypesWithAssayRuns() throws Exception
         portalHelper.addWebPart("Experiment Runs");
         portalHelper.addWebPart("Assay List");
 
-        // upload a file for a sample's file field
+        log(String.format("Upload a file '%s' to a sample's file field.", SAMPLE_TXT_FILE.getName()));
         clickAndWait(Locator.linkWithText(testSamples));
         DataRegionTable sourceSamplesTable = new SampleTypeHelper(this).getSamplesDataRegionTable();
         sourceSamplesTable.clickEditRow(1);
         waitForElementToBeVisible(Locator.tagWithAttribute("input", "type", "file"));
         setFormElement(Locator.tagWithAttribute("input", "type", "file"), SAMPLE_TXT_FILE);
+        // setFormElement doesn't check that the form element is set.
+        // Because this test uses random field names, we should validate that the file was actually uploaded. If the
+        // file is missing later in the test, we can be sure it was present at this point.
+        Assert.assertTrue("File not uploaded to 'add new' form.",
+                waitFor(()->!getFormElement(Locator.tagWithAttribute("input", "type", "file")).isEmpty(), 1_500));
         clickAndWait(Locator.lkButton("Submit"));
 
+        waitForElementToBeVisible(Locator.linkContainingText(SAMPLE_TXT_FILE.getName()));
+
+        new ArtifactCollector(this).dumpPageSnapshot("File_Attached_Proof");
+
         goToProjectFolder(getProjectName(), subfolder);
 
         // now define an assay that references it
@@ -644,14 +654,26 @@ public void testExportImportSampleTypesWithAssayRuns() throws Exception
             exportData.add(dataTable.getRowDataAsMap(i));
         }
 
-        // now export the current folder and import it to importProject
+        log("Now export the current folder and import it to importProject.");
         goToFolderManagement()
                 .goToExportTab();
 
-        Checkbox checkbox = new Checkbox(Locator.tagWithText("label", ExportFolderPage.EXPERIMENTS_AND_RUNS)
-                .precedingSibling("input").waitForElement(getDriver(), WAIT_FOR_JAVASCRIPT));
-        new Checkbox(Locator.tagWithText("label", "Files").precedingSibling("input").findElement(getDriver())).check();
-        checkbox.check();
+        new Checkbox(Locator.tagWithText("label", ExportFolderPage.EXPERIMENTS_AND_RUNS)
+                .precedingSibling("input").waitForElement(getDriver(), WAIT_FOR_JAVASCRIPT)).check();
+
+        new Checkbox(Locator.tagWithText("label", "Files")
+                .precedingSibling("input").waitForElement(getDriver(), WAIT_FOR_JAVASCRIPT)).check();
+
+        Assert.assertTrue("Experiment and Runs not checked for export.",
+                new Checkbox(Locator.tagWithText("label", ExportFolderPage.EXPERIMENTS_AND_RUNS)
+                        .precedingSibling("input").waitForElement(getDriver(), WAIT_FOR_JAVASCRIPT)).isChecked());
+
+        Assert.assertTrue("Files not checked for export.",
+                new Checkbox(Locator.tagWithText("label", "Files").precedingSibling("input").findElement(getDriver()))
+                        .isChecked());
+
+        log("'Experiment and Runs' & 'Files' are selected for export.");
+
         File exportedFolderFile = doAndWaitForDownload(()->findButton("Export").click());
 
         goToProjectFolder(IMPORT_PROJECT_NAME, importFolder);

src/org/labkey/test/tests/SampleTypeNameExpressionTest.java

@@ -896,7 +896,7 @@ public void testNameExpressionPreview() throws IOException, CommandException
         mouseOver(createPage.getComponentElement());
 
         log("Use a name expression using a field from the named parent, with parent type not encoded.");
-        nameExpressionBad = String.format("SNP_${genId}_${%s/$s}_${materialInputs/%s/%s}", parentAlias, PARENT_FIELD_CURLY_RIGHT_INT.getExpName(), PARENT_SAMPLE_TYPE, PARENT_FIELD_CURLY_LEFT.getName());
+        nameExpressionBad = String.format("SNP_${genId}_${%s/%s}_${materialInputs/%s/%s}", parentAlias, PARENT_FIELD_CURLY_RIGHT_INT.getExpName(), PARENT_SAMPLE_TYPE, PARENT_FIELD_CURLY_LEFT.getName());
         createPage.setNameExpression(nameExpressionBad);
         actualMsg = createPage.getNameExpressionPreview();
         checker().withScreenshot("Parent_Fields_Preview_Error")

src/org/labkey/test/tests/SampleTypeTest.java

@@ -450,7 +450,7 @@ public void testImportTypeOptions()
         String overlap =  "Name1\tToBee\n";
         String newData = "Name2\tSee\n";
         setFormElement(Locator.name("text"), header + overlap + newData);
-        clickButton("Submit", "duplicate key");
+        clickButton("Submit", "already exists");
 
         log("Switch to 'Insert and Replace'");
         importDataPage.setCopyPasteMerge(true);
@@ -475,7 +475,7 @@ public void testImportTypeOptions()
         importDataPage = drt.clickImportBulkData();
         importDataPage.setFile(sampleData);
         final String errorText = importDataPage.submitExpectingError();
-        Assert.assertTrue("Wrong error when importing duplicate samples. " + errorText, errorText.contains("duplicate key"));
+        Assert.assertTrue("Wrong error when importing duplicate samples. " + errorText, errorText.contains("already exists"));
         // TODO: Regression check for Issue 44202: Ugly error when data import fails due to duplicate key
         // Assert.assertTrue("Wrong error when importing duplicate samples. " + errorText, errorText.length() < 100);