Skip to content

Fix fieldKey encoding for CustomizeView column picker #3148

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

Open
labkey-tchad wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix fieldKey encoding for CustomizeView column picker #3148

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0913f0c
Fix fieldKey encoding for CustomizeView column picker
labkey-tchad Aug 10, 2026
e01e1f6
Match product encoding.
labkey-tchad Aug 11, 2026
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
18 changes: 4 additions & 14 deletions src/org/labkey/test/components/CustomizeView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.labkey.test.params.FieldKey;
import org.labkey.test.selenium.RefindingWebElement;
import org.labkey.test.util.DataRegionTable;
import org.labkey.test.util.EscapeUtil;
import org.labkey.test.util.Ext4Helper;
import org.labkey.test.util.LogMethod;
import org.labkey.test.util.LoggedParam;
Expand Down Expand Up @@ -336,18 +335,9 @@ public enum ViewItemType
Sort
}

private String encodeFieldKeyPart(String fieldKeyPart)
private String extHtmlEncode(String fieldKeyPart)
{
String _fieldKeyPart = EscapeUtil.encodeUriPath(fieldKeyPart);
if (_fieldKeyPart != null)
{
// Jetty encodes # ? ; ' but we want to preserve these characters in paths
_fieldKeyPart = _fieldKeyPart.replaceAll("%23", "#");
_fieldKeyPart = _fieldKeyPart.replaceAll("%3F", "?");
_fieldKeyPart = _fieldKeyPart.replaceAll("%3B", ";");
_fieldKeyPart = _fieldKeyPart.replaceAll("%27", "'");
}
return _fieldKeyPart;
return getWrapper().executeScript("return encodeURI(arguments[0]);", String.class, fieldKeyPart);
}

/**
Expand All @@ -358,7 +348,7 @@ private WebElement expandPivots(CharSequence fieldKey)
{
Iterator<FieldKey> fieldKeyIterator = Objects.requireNonNull(FieldKey.fromFieldKey(fieldKey), "Invalid fieldKey: " + fieldKey).getIterator();
FieldKey currentFieldKey = fieldKeyIterator.next();
String dataRecordId = encodeFieldKeyPart(currentFieldKey.toString().toUpperCase());
String dataRecordId = extHtmlEncode(currentFieldKey.toString().toUpperCase());

while (fieldKeyIterator.hasNext())
{
Expand All @@ -375,7 +365,7 @@ private WebElement expandPivots(CharSequence fieldKey)
WebDriverWrapper.waitFor(() -> Locator.css("tr[data-recordid] + tr:not(.x4-grid-row)").findElements(getComponentElement()).isEmpty(), 2000); // Spacer row appears during expansion animation

currentFieldKey = fieldKeyIterator.next();
dataRecordId = encodeFieldKeyPart(currentFieldKey.toString().toUpperCase());
dataRecordId = extHtmlEncode(currentFieldKey.toString().toUpperCase());
}

return Locator.tag("tr").withClass("x4-grid-data-row").withAttribute("data-recordid", dataRecordId).findElement(getComponentElement());
Expand Down