From 66c066b6f37027ab7fffc20ce255a4794893bfec Mon Sep 17 00:00:00 2001 From: RameshRaparthi <135648797+RameshRapa@users.noreply.github.com> Date: Tue, 1 Jul 2025 14:42:12 -0500 Subject: [PATCH 1/3] This Commit has code changes for adding of sortOrder to the getPackages API json response. (#980) --- snd/src/org/labkey/snd/SNDServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/snd/src/org/labkey/snd/SNDServiceImpl.java b/snd/src/org/labkey/snd/SNDServiceImpl.java index 375d86e04..f6627d9a5 100644 --- a/snd/src/org/labkey/snd/SNDServiceImpl.java +++ b/snd/src/org/labkey/snd/SNDServiceImpl.java @@ -474,7 +474,10 @@ private JSONArray lookupValuesToJson(Container c, User u, String schema, String Object displayable = rs.getObject("displayable"); jsonObject.put("displayable",displayable); } - + if(colNames.contains("sortOrder")) { + Object sortOrder = rs.getObject("sortOrder"); + jsonObject.put("sortOrder",sortOrder); + } array.put(jsonObject); } } From c015096de07aa69bb78475e5213eeca5cba2e8cb Mon Sep 17 00:00:00 2001 From: Dan Duffek Date: Tue, 8 Jul 2025 11:23:19 -0700 Subject: [PATCH 2/3] Wait before clicking. (#983) --- .../src/org/labkey/test/pages/ehr/NotificationAdminPage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ehr/test/src/org/labkey/test/pages/ehr/NotificationAdminPage.java b/ehr/test/src/org/labkey/test/pages/ehr/NotificationAdminPage.java index 7eba6ebe6..ef494bb64 100644 --- a/ehr/test/src/org/labkey/test/pages/ehr/NotificationAdminPage.java +++ b/ehr/test/src/org/labkey/test/pages/ehr/NotificationAdminPage.java @@ -97,7 +97,7 @@ public void clickRunReportInBrowser(String name) { log("Clicking Run Report in browser for " + name); name = name.replace(" ", ""); - clickAndWait(Locator.tagWithAttributeContaining("a", "href", name).withText("Run Report In Browser")); + waitAndClickAndWait(Locator.tagWithAttributeContaining("a", "href", name).withText("Run Report In Browser")); } public void clickManuallyTriggerEmail(String name) From 3e94b54fca6534d8d6c0a3b74df8669b93db6d39 Mon Sep 17 00:00:00 2001 From: Dan Duffek Date: Fri, 11 Jul 2025 13:05:27 -0700 Subject: [PATCH 3/3] Adding some predictive waits to the tests. (#987) --- .../src/org/labkey/test/pages/ehr/NotificationAdminPage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ehr/test/src/org/labkey/test/pages/ehr/NotificationAdminPage.java b/ehr/test/src/org/labkey/test/pages/ehr/NotificationAdminPage.java index 7eba6ebe6..ef494bb64 100644 --- a/ehr/test/src/org/labkey/test/pages/ehr/NotificationAdminPage.java +++ b/ehr/test/src/org/labkey/test/pages/ehr/NotificationAdminPage.java @@ -97,7 +97,7 @@ public void clickRunReportInBrowser(String name) { log("Clicking Run Report in browser for " + name); name = name.replace(" ", ""); - clickAndWait(Locator.tagWithAttributeContaining("a", "href", name).withText("Run Report In Browser")); + waitAndClickAndWait(Locator.tagWithAttributeContaining("a", "href", name).withText("Run Report In Browser")); } public void clickManuallyTriggerEmail(String name)