Skip to content

Fix data region column name references #6812

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
merged 5 commits into from
Jul 2, 2025
+18 −15
Merged

Fix data region column name references #6812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e25d940
Fix data region column name references
labkey-tchad Jun 30, 2025
d94f4c8
Get rid of more CustomizeView methods
labkey-tchad Jun 30, 2025
dded63f
Merge origin/develop into 25.7_fb_dataRegionCleanup
labkey-tchad Jun 30, 2025
d942b27
Merge origin/develop into 25.7_fb_dataRegionCleanup
labkey-tchad Jul 1, 2025
afc6b4a
Merge origin/develop into 25.7_fb_dataRegionCleanup
labkey-tchad Jul 1, 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
8 changes: 4 additions & 4 deletions study/test/src/org/labkey/test/tests/study/AssayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,9 +440,9 @@ private void uploadRuns(String folder, String asUser)
ALIASED_DATA);

_customizeViewsHelper.openCustomizeViewPanel();
_customizeViewsHelper.addColumn("SpecimenID/GlobalUniqueId", "Specimen Global Unique Id");
_customizeViewsHelper.addColumn("SpecimenID/Specimen/PrimaryType", "Specimen Specimen Primary Type");
_customizeViewsHelper.addColumn("SpecimenID/AssayMatch", "Specimen Assay Match");
_customizeViewsHelper.addColumn("SpecimenID/GlobalUniqueId");
_customizeViewsHelper.addColumn("SpecimenID/Specimen/PrimaryType");
_customizeViewsHelper.addColumn("SpecimenID/AssayMatch");
_customizeViewsHelper.removeColumn("Run/testAssayRunProp1");
_customizeViewsHelper.removeColumn("Run/Batch/testAssaySetProp2");
_customizeViewsHelper.removeColumn("testAssayDataProp4");
Expand Down Expand Up @@ -542,7 +542,7 @@ private void publishData()

log("Verifying that the data was published");
_customizeViewsHelper.openCustomizeViewPanel();
_customizeViewsHelper.addColumn("QCState", "QC State");
_customizeViewsHelper.addColumn("QCState");
_customizeViewsHelper.applyCustomView();
assertTextPresent(
"Pending Review",
Expand Down
6 changes: 3 additions & 3 deletions study/test/src/org/labkey/test/tests/study/LinkAssayToStudyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,9 @@ private void uploadRuns(String folder, String asUser)
ALIASED_DATA);

_customizeViewsHelper.openCustomizeViewPanel();
_customizeViewsHelper.addColumn("SpecimenID/GlobalUniqueId", "Specimen Global Unique Id");
_customizeViewsHelper.addColumn("SpecimenID/Specimen/PrimaryType", "Specimen Specimen Primary Type");
_customizeViewsHelper.addColumn("SpecimenID/AssayMatch", "Specimen Assay Match");
_customizeViewsHelper.addColumn("SpecimenID/GlobalUniqueId");
_customizeViewsHelper.addColumn("SpecimenID/Specimen/PrimaryType");
_customizeViewsHelper.addColumn("SpecimenID/AssayMatch");
_customizeViewsHelper.removeColumn("Run/testAssayRunProp1");
_customizeViewsHelper.removeColumn("Run/Batch/testAssaySetProp2");
_customizeViewsHelper.removeColumn("testAssayDataProp4");
Expand Down
2 changes: 1 addition & 1 deletion study/test/src/org/labkey/test/tests/study/QuerySnapshotTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public void testCustomView()
clickAndWait(Locator.linkWithText("APX-1: Abbreviated Physical Exam"));
_customizeViewsHelper.openCustomizeViewPanel();

_customizeViewsHelper.addColumn("DataSets/DEM-1/DEMraco", "DEM-1: Demographics Screening 4f.Other specify");
_customizeViewsHelper.addColumn("DataSets/DEM-1/DEMraco");
_customizeViewsHelper.saveCustomView("APX Joined View");

createQuerySnapshot(APX_SNAPSHOT, true, false);
Expand Down
3 changes: 2 additions & 1 deletion study/test/src/org/labkey/test/tests/study/SharedStudyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.labkey.test.pages.DatasetInsertPage;
import org.labkey.test.pages.study.DatasetDesignerPage;
import org.labkey.test.pages.study.ManageVisitPage;
import org.labkey.test.params.FieldKey;
import org.labkey.test.util.Crawler;
import org.labkey.test.util.DataRegionTable;
import org.labkey.test.util.Ext4Helper;
Expand Down Expand Up @@ -168,7 +169,7 @@ public void testVisitLookup()
beginAt("/" + getProjectName() + "/" + STUDY1 + "/query-executeQuery.view?schemaName=study&query.queryName=PVString_Two");
_customizeViewsHelper.openCustomizeViewPanel();
_customizeViewsHelper.showHiddenItems();
_customizeViewsHelper.addColumn(new String[]{"PandaVisit", "Visit", "Folder"});
_customizeViewsHelper.addColumn(FieldKey.fromParts("PandaVisit", "Visit", "Folder"));
_customizeViewsHelper.saveCustomView("withfolder");

log("Verify visit folder is project");
Expand Down
5 changes: 3 additions & 2 deletions study/test/src/org/labkey/test/tests/study/StudyDateAndContinuousTimepointTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.labkey.test.components.domain.DomainFormPanel;
import org.labkey.test.pages.study.DatasetDesignerPage;
import org.labkey.test.params.FieldDefinition;
import org.labkey.test.params.FieldKey;
import org.labkey.test.util.DataRegionTable;
import org.labkey.test.util.Ext4Helper;
import org.labkey.test.util.PortalHelper;
Expand Down Expand Up @@ -100,7 +101,7 @@ public void testVisitWithAllTimepointTypes()
CustomizeView tableCustomizeView = table.getCustomizeView();
tableCustomizeView.openCustomizeViewPanel();
waitForText("Available Fields");
tableCustomizeView.addColumn(new String[]{"ParticipantVisit", "Visit"});
tableCustomizeView.addColumn(FieldKey.fromParts("ParticipantVisit", "Visit"));
tableCustomizeView.saveDefaultView();
checker().verifyEquals("Visit field is not blank when study is changed to date", Arrays.asList("Day 0"),
table.getColumnDataAsText("ParticipantVisit/Visit"));
Expand Down Expand Up @@ -180,7 +181,7 @@ public void testPublishStudy()
CustomizeView tableCustomizeView = table.getCustomizeView();
tableCustomizeView.openCustomizeViewPanel();
waitForText("Available Fields");
tableCustomizeView.addColumn(new String[]{"ParticipantVisit", "Visit"});
tableCustomizeView.addColumn(FieldKey.fromParts("ParticipantVisit", "Visit"));
tableCustomizeView.saveDefaultView();
checker().verifyEquals("Visit field is not Day 0 when study is changed to date", Arrays.asList("Day 0"),
table.getColumnDataAsText("ParticipantVisit/Visit")); //Needs to be updated when related bug is fixed.
Expand Down
2 changes: 1 addition & 1 deletion study/test/src/org/labkey/test/tests/study/StudyPublishTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,7 +1065,7 @@ private void createCustomView(String name, String dataset, String[] ptids, boole

clickAndWait(Locator.linkWithText(dataset));
_customizeViewsHelper.openCustomizeViewPanel();
_customizeViewsHelper.addFilter("MouseId", "Mouse Id", "Equals One Of", ptidFilter);
_customizeViewsHelper.addFilter("MouseId", "Equals One Of", ptidFilter);
_customizeViewsHelper.saveCustomView(name, shared);
}

Expand Down
3 changes: 2 additions & 1 deletion study/test/src/org/labkey/test/tests/study/StudySimpleExportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.labkey.test.pages.study.ManageVisitPage;
import org.labkey.test.pages.study.QCStateTableRow;
import org.labkey.test.params.FieldDefinition;
import org.labkey.test.params.FieldKey;
import org.labkey.test.tests.StudyBaseTest;
import org.labkey.test.util.DataRegionTable;
import org.labkey.test.util.Ext4Helper;
Expand Down Expand Up @@ -522,7 +523,7 @@ public void verifyVisitProperties()
clickTab("Clinical and Assay Data");
waitAndClickAndWait(Locator.linkWithText(TEST_DATASET_NAME));
_customizeViewsHelper.openCustomizeViewPanel();
_customizeViewsHelper.addColumn(new String[]{"ParticipantVisit", "Visit"});
_customizeViewsHelper.addColumn(FieldKey.fromParts("ParticipantVisit", "Visit"));
_customizeViewsHelper.saveDefaultView();
mouseOver(Locator.tagWithText("td", visitLabel));
waitForElement(Locator.xpath("id('helpDivBody')").containing(visitDescription));
Expand Down
4 changes: 2 additions & 2 deletions study/test/src/org/labkey/test/tests/study/StudyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ protected void verifyStudyAndDatasets(boolean isVisitBased)
clickAndWait(Locator.linkWithText("verifyAssay"));
BootstrapMenu.find(getDriver(),"QC State").clickSubMenu(true, "All data");
_customizeViewsHelper.openCustomizeViewPanel();
_customizeViewsHelper.addColumn("QCState", "QC State");
_customizeViewsHelper.addColumn("QCState");
_customizeViewsHelper.addSort("SampleId", SortDirection.ASC);
_customizeViewsHelper.applyCustomView();
DataRegionTable table = new DataRegionTable("Dataset", this);
Expand Down Expand Up @@ -810,7 +810,7 @@ protected void verifyStudyAndDatasets(boolean isVisitBased)
new DatasetPropertiesPage(getDriver())
.clickViewData();
_customizeViewsHelper.openCustomizeViewPanel();
_customizeViewsHelper.addColumn("Bad Name", "Bad Name");
_customizeViewsHelper.addColumn("Bad Name");
_customizeViewsHelper.applyCustomView();
BootstrapMenu.find(getDriver(),"QC State").clickSubMenu(true, "All data");
clickAndWait(Locator.tagWithAttribute("a", "data-original-title","edit").index(0));
Expand Down