Rearrange the interaction with the Manually Define button to make sure it's ready (#2499)

labkey-jeckels · web-flow · commit 60fa9ef2bdf9 · 2025-06-18T12:59:40.000-04:00
diff --git a/src/org/labkey/test/components/domain/DomainFormPanel.java b/src/org/labkey/test/components/domain/DomainFormPanel.java
@@ -256,8 +256,8 @@ else if (validator instanceof FieldDefinition.TextChoiceValidator textChoiceVali
      */
     public DomainFormPanel clickManuallyDefineFields()
     {
-        getWrapper().scrollIntoView(elementCache().manuallyDefineButton, true);
         getWrapper().shortWait().until(ExpectedConditions.elementToBeClickable(elementCache().manuallyDefineButton)); // give modal dialogs time to disappear
+        getWrapper().scrollIntoView(elementCache().manuallyDefineButton, true);
         elementCache().manuallyDefineButton.click();
 
         return this;

Original file line number	Diff line number	Diff line change
`@@ -256,8 +256,8 @@ else if (validator instanceof FieldDefinition.TextChoiceValidator textChoiceVali`
`256`	`256`	`*/`
`257`	`257`	`public DomainFormPanel clickManuallyDefineFields()`
`258`	`258`	`{`
`259`		`- getWrapper().scrollIntoView(elementCache().manuallyDefineButton, true);`
`260`	`259`	`getWrapper().shortWait().until(ExpectedConditions.elementToBeClickable(elementCache().manuallyDefineButton)); // give modal dialogs time to disappear`
	`260`	`+ getWrapper().scrollIntoView(elementCache().manuallyDefineButton, true);`
`261`	`261`	`elementCache().manuallyDefineButton.click();`
`262`	`262`
`263`	`263`	`return this;`