Merge branch 'develop' into fb_encodeFormName

Author: labkey-nicka

src/org/labkey/remoteapi/puppeteer/PuppeteerSettings.java

@@ -23,9 +23,6 @@
 public class PuppeteerSettings
 {
     private Boolean _enabled;
-    private String _mode;
-    private String _dockerImage;
-    private Integer _dockerPort;
     private String _remoteUrl;
 
     public PuppeteerSettings()
@@ -36,9 +33,6 @@ public PuppeteerSettings(JSONObject json)
     {
         this();
         _enabled = json.getBoolean("enabled");
-        _mode = json.getString("mode");
-        _dockerImage = json.optString("docker.image", null);
-        _dockerPort = json.optInt("docker.port");
         _remoteUrl = json.getString("remote.url");
     }
 
@@ -57,36 +51,6 @@ public void setEnabled(Boolean enabled)
         _enabled = enabled;
     }
 
-    public String getMode()
-    {
-        return _mode;
-    }
-
-    public void setMode(String mode)
-    {
-        _mode = mode;
-    }
-
-    public String getDockerImage()
-    {
-        return _dockerImage;
-    }
-
-    public void setDockerImage(String dockerImage)
-    {
-        _dockerImage = dockerImage;
-    }
-
-    public Integer getDockerPort()
-    {
-        return _dockerPort;
-    }
-
-    public void setDockerPort(Integer dockerPort)
-    {
-        _dockerPort = dockerPort;
-    }
-
     public String getRemoteUrl()
     {
         return _remoteUrl;
@@ -103,12 +67,6 @@ public JSONObject toJSON()
 
         if (getEnabled() != null)
             settings.put("enabled", getEnabled());
-        if (getMode() != null)
-            settings.put("mode", getMode());
-        if (getDockerImage() != null)
-            settings.put("docker.image", getDockerImage());
-        if (getDockerPort() != null)
-            settings.put("docker.port", getDockerPort());
         if (getRemoteUrl() != null)
             settings.put("remote.url", getRemoteUrl());
 

src/org/labkey/test/LabKeySiteWrapper.java

@@ -1745,7 +1745,7 @@ public String getConversionErrorMessage(Object value, String fieldName, Class<?>
         return errorMessage;
     }
 
-    private ProductKey getProductConfiguration() throws IOException, CommandException
+    protected ProductKey getProductConfiguration() throws IOException, CommandException
     {
         SimpleGetCommand command = new SimpleGetCommand("admin", "productFeature");
         var resp = command.execute(createDefaultConnection(), "/");

src/org/labkey/test/components/ui/search/EntityFieldFilterModal.java

@@ -10,6 +10,8 @@
 
 import java.util.List;
 
+import static org.labkey.test.WebDriverWrapper.sleep;
+
 /**
  * Wraps 'labkey-ui-component' defined in <code>internal/components/search/EntityFieldFilterModal.tsx</code>
  */
@@ -36,8 +38,13 @@ protected void waitForReady()
     public EntityFieldFilterModal selectQuery(String queryName)
     {
         WebElement queryItem = elementCache().findQueryOption(queryName);
-        getWrapper().doAndWaitForElementToRefresh(queryItem::click,
-                () -> elementCache().listItemLoc.findElement(elementCache().fieldsSelectionPanel), getWrapper().shortWait());
+        queryItem.click();
+        sleep(500); // wait for the fields to be displayed or updated.
+        // The wait below does not consistently work. It works for the first rendering of the modal, but
+        // if the modal is opened with a query already selected, selecting another query does not cause
+        // staleness of the field panel elements, only an update of the contents.
+//        getWrapper().doAndWaitForElementToRefresh(queryItem::click,
+//                () -> elementCache().listItemLoc.findElement(elementCache().fieldsSelectionPanel), getWrapper().shortWait());
 
         getWrapper().shortWait().until(ExpectedConditions.invisibilityOfElementLocated(BootstrapLocators.loadingSpinner));
 

src/org/labkey/test/util/puppeteer/PuppeteerHelper.java

@@ -30,7 +30,6 @@ public static void enableRemoteService(Connection connection) throws IOException
     {
         var puppeteerSettings = new PuppeteerSettings();
         puppeteerSettings.setEnabled(true);
-        puppeteerSettings.setMode("remote");
         puppeteerSettings.setRemoteUrl(getRemoteServiceURL());
 
         updateSettings(connection, puppeteerSettings);