Skip to content

Issue 53012: Edit parent details dropdown remembers cancelled option updates re-edit #2441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-nicka merged 2 commits into from
May 8, 2025
Merged

Issue 53012: Edit parent details dropdown remembers cancelled option updates re-edit #2441

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
400fc02
Separate find from waitFor usages
labkey-nicka May 7, 2025
ddf47f3
Additional test coverage
labkey-nicka May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/org/labkey/test/components/ui/entities/ParentEntityEditPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.labkey.test.WebDriverWrapper;
import org.labkey.test.components.Component;
import org.labkey.test.components.WebDriverComponent;
import org.labkey.test.components.react.BaseReactSelect;
import org.labkey.test.components.react.FilteringReactSelect;
import org.labkey.test.components.react.ReactSelect;
import org.openqa.selenium.NoSuchElementException;
Expand Down Expand Up @@ -303,6 +304,11 @@ public List<ReactSelect> getAllEntityTypes()
.findAll(elementCache());
}

private BaseReactSelect.BaseReactSelectFinder<FilteringReactSelect> getParentFinder(String typeName)
{
return FilteringReactSelect.finder(getDriver()).withNamedInput(String.format("parentEntityValue_%s", typeName));
}

/**
* Get a select for a given parent entity type.
*
Expand All @@ -311,8 +317,7 @@ public List<ReactSelect> getAllEntityTypes()
*/
public FilteringReactSelect getParent(String typeName)
{
return FilteringReactSelect.finder(getDriver()).withNamedInput(String.format("parentEntityValue_%s", typeName))
.find(elementCache());
return getParentFinder(typeName).find(elementCache());
}

/**
Expand Down Expand Up @@ -353,7 +358,7 @@ public ParentEntityEditPanel addParents(String typeName, List<String> parentIds)
if (getEntityType(typeName) == null)
getAddNewEntityTypeSelect().select(typeName);

var selectParent = getParent(typeName);
var selectParent = getParentFinder(typeName).waitFor(elementCache());

// Adding for debugging (trying to understand why save button is not enabled after setting).
getWrapper().log(String.format("Selections before adding: %s", selectParent.getSelections()));
Expand Down Expand Up @@ -496,7 +501,7 @@ protected ElementCache newElementCache()
protected class ElementCache extends Component<?>.ElementCache
{
final WebElement saveButton = Locator.byClass("btn-success").withText("Save").findWhenNeeded(this);
final WebElement cancelButton = Locator.byClass("btn-default").withText("Cancel").findWhenNeeded(this);
final WebElement cancelButton = Locator.byClass("btn-default").withText("Cancel").refindWhenNeeded(this);

// This is the 'Add' button that is contained inside the panel.
final WebElement addButton = Locator
Expand Down