From d91d7d2f0cec59b54a98d514becd3c205d821c29 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 16 Dec 2025 11:04:29 -0800 Subject: [PATCH 1/3] Add SaveAuditSettingsCommand --- .../admin/SaveAuditSettingsCommand.java | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/org/labkey/remoteapi/admin/SaveAuditSettingsCommand.java diff --git a/src/org/labkey/remoteapi/admin/SaveAuditSettingsCommand.java b/src/org/labkey/remoteapi/admin/SaveAuditSettingsCommand.java new file mode 100644 index 0000000000..563b81870c --- /dev/null +++ b/src/org/labkey/remoteapi/admin/SaveAuditSettingsCommand.java @@ -0,0 +1,37 @@ +package org.labkey.remoteapi.admin; + +import org.json.JSONObject; +import org.labkey.remoteapi.CommandResponse; +import org.labkey.remoteapi.PostCommand; + +public class SaveAuditSettingsCommand extends PostCommand +{ + private static final String ACTION_NAME = "saveAuditSettings"; + private static final String CONTROLLER_NAME = "audit"; + private boolean _requireUserComments = false; + + public SaveAuditSettingsCommand(boolean requireUserComments) + { + super(CONTROLLER_NAME, ACTION_NAME); + _requireUserComments = requireUserComments; + } + + public boolean isRequireUserComments() + { + return _requireUserComments; + } + + public void setRequireUserComments(boolean requireUserComments) + { + this._requireUserComments = requireUserComments; + } + + @Override + public JSONObject getJsonObject() + { + JSONObject json = new JSONObject(); + json.put("requireUserComments", isRequireUserComments()); + + return json; + } +} From 6cde84a3e3d2a6df04a7df9e7fb53b2839f87e30 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 16 Dec 2025 11:05:04 -0800 Subject: [PATCH 2/3] Add argument for importAssay to associate a workflow Task with the run --- src/org/labkey/test/util/APIAssayHelper.java | 11 +++++++++-- src/org/labkey/test/util/AuditLogHelper.java | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/org/labkey/test/util/APIAssayHelper.java b/src/org/labkey/test/util/APIAssayHelper.java index e02849f963..56b846f2ba 100644 --- a/src/org/labkey/test/util/APIAssayHelper.java +++ b/src/org/labkey/test/util/APIAssayHelper.java @@ -82,15 +82,22 @@ public ImportRunResponse importAssay(int assayID, String runFilePath, String pro return irc.execute(_test.createDefaultConnection(), projectPath); } - @LogMethod(quiet = true) public ImportRunResponse importAssay(int assayID, String runName, List> dataRows, String projectPath, Map runProperties, Map batchProperties, String errorMsg) throws CommandException, IOException + { + return importAssay(assayID, runName, dataRows, projectPath, runProperties, batchProperties, errorMsg, null); + } + + @LogMethod(quiet = true) + public ImportRunResponse importAssay(int assayID, String runName, List> dataRows, String projectPath, + Map runProperties, Map batchProperties, String errorMsg, @Nullable Integer workflowTaskId) throws CommandException, IOException { ImportRunCommand irc = new ImportRunCommand(assayID, dataRows); irc.setName(runName); irc.setProperties(runProperties); irc.setBatchProperties(batchProperties); irc.setTimeout(180000); // Wait 3 minutes for assay import + irc.setWorkflowTaskId(workflowTaskId); if (errorMsg != null) { try @@ -121,7 +128,7 @@ public ImportRunResponse importAssay(int assayID, String runName, List> dataRows, String projectPath, Map runProperties, Map batchProperties) throws CommandException, IOException { - return importAssay(assayID, runName, dataRows, projectPath, runProperties, batchProperties, null); + return importAssay(assayID, runName, dataRows, projectPath, runProperties, batchProperties, null, null); } @LogMethod(quiet = true) diff --git a/src/org/labkey/test/util/AuditLogHelper.java b/src/org/labkey/test/util/AuditLogHelper.java index 89bf6e0010..ef8e05f9aa 100644 --- a/src/org/labkey/test/util/AuditLogHelper.java +++ b/src/org/labkey/test/util/AuditLogHelper.java @@ -6,6 +6,7 @@ import org.json.JSONException; import org.json.JSONObject; import org.labkey.api.collections.CaseInsensitiveHashMap; +import org.labkey.remoteapi.Command; import org.labkey.remoteapi.CommandException; import org.labkey.remoteapi.Connection; import org.labkey.remoteapi.query.ContainerFilter; @@ -155,6 +156,8 @@ public Integer getLatestAuditRowId(String auditTable) throws IOException, Comman return (Integer) rows.get(0).get(rowId); } + + public DataRegionTable beginAtAuditEventView(String auditTable, Integer rowIdCutoff) { return ShowAuditLogPage.beginAt(_wrapper, auditTable, rowIdCutoff).getLogTable(); From 6dd137935dd5c0e381f7119fca30a5cc7db54ea5 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 16 Dec 2025 14:20:54 -0800 Subject: [PATCH 3/3] Remove unused import and extra spaces --- src/org/labkey/test/util/AuditLogHelper.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/org/labkey/test/util/AuditLogHelper.java b/src/org/labkey/test/util/AuditLogHelper.java index ef8e05f9aa..89bf6e0010 100644 --- a/src/org/labkey/test/util/AuditLogHelper.java +++ b/src/org/labkey/test/util/AuditLogHelper.java @@ -6,7 +6,6 @@ import org.json.JSONException; import org.json.JSONObject; import org.labkey.api.collections.CaseInsensitiveHashMap; -import org.labkey.remoteapi.Command; import org.labkey.remoteapi.CommandException; import org.labkey.remoteapi.Connection; import org.labkey.remoteapi.query.ContainerFilter; @@ -156,8 +155,6 @@ public Integer getLatestAuditRowId(String auditTable) throws IOException, Comman return (Integer) rows.get(0).get(rowId); } - - public DataRegionTable beginAtAuditEventView(String auditTable, Integer rowIdCutoff) { return ShowAuditLogPage.beginAt(_wrapper, auditTable, rowIdCutoff).getLogTable();