From 20460a3f5abd500b7fb811022beb588f2e9cca8f Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 16 Dec 2025 11:08:01 -0800 Subject: [PATCH 1/2] Add workflowTaskId property to `ImportRunCommand` --- CHANGELOG.md | 1 + build.gradle | 2 +- src/org/labkey/remoteapi/assay/ImportRunCommand.java | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cccbc9e..aea004b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## version 7.1.0-SNAPSHOT *Released*: TBD * Gradle, Gradle plugins, commonsCodec, HttpClient, HttpCore version updates +* Add workflowTaskId property to `ImportRunCommand` ## version 7.0.0 *Released*: 18 July 2025 diff --git a/build.gradle b/build.gradle index f1e64d8..1152bd6 100644 --- a/build.gradle +++ b/build.gradle @@ -70,7 +70,7 @@ repositories { group = "org.labkey.api" -version = "7.0.0-SNAPSHOT" +version = "7.0.0-moveJobs-SNAPSHOT" dependencies { api "org.json:json:${jsonObjectVersion}" diff --git a/src/org/labkey/remoteapi/assay/ImportRunCommand.java b/src/org/labkey/remoteapi/assay/ImportRunCommand.java index d208d58..d1a3a7f 100644 --- a/src/org/labkey/remoteapi/assay/ImportRunCommand.java +++ b/src/org/labkey/remoteapi/assay/ImportRunCommand.java @@ -41,6 +41,7 @@ public class ImportRunCommand extends PostCommand private Map _properties; private Map _batchProperties; private String _auditUserComment; + private Integer _workflowTaskId; // Only one of the follow is allowed private List> _dataRows; @@ -122,6 +123,11 @@ public void setAuditUserComment(String auditUserComment) _auditUserComment = auditUserComment; } + public void setWorkflowTaskId(Integer workflowTaskId) + { + _workflowTaskId = workflowTaskId; + } + @Override protected ImportRunResponse createResponse(String text, int status, String contentType, JSONObject json) { @@ -165,6 +171,8 @@ protected HttpPost createRequest(URI uri) json.put("plateMetadata", _plateMetadata); if (_auditUserComment != null) json.put("auditUserComment", _auditUserComment); + if (_workflowTaskId != null) + json.put("workflowTask", _workflowTaskId); builder.addTextBody("json", json.toString(), ContentType.APPLICATION_JSON); } @@ -179,6 +187,8 @@ protected HttpPost createRequest(URI uri) builder.addTextBody("comment", _comment); if (_auditUserComment != null) builder.addTextBody("auditUserComment", _auditUserComment); + if (_workflowTaskId != null) + builder.addTextBody("workflowTask", String.valueOf(_workflowTaskId)); if (_properties != null) { for (Map.Entry entry : _properties.entrySet()) From af56187938d9b662341dfa3f7a406c5ead217555 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 22 Dec 2025 13:18:58 -0800 Subject: [PATCH 2/2] Prepare for v7.1.0 --- CHANGELOG.md | 6 +++++- build.gradle | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aea004b..227b864 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ # The LabKey Remote API Library for Java - Change Log -## version 7.1.0-SNAPSHOT +## version 7.2.0-SNAPSHOT *Released*: TBD +* + +## version 7.1.0 +*Released*: 22 December 2025 * Gradle, Gradle plugins, commonsCodec, HttpClient, HttpCore version updates * Add workflowTaskId property to `ImportRunCommand` diff --git a/build.gradle b/build.gradle index 1152bd6..95153ca 100644 --- a/build.gradle +++ b/build.gradle @@ -70,7 +70,7 @@ repositories { group = "org.labkey.api" -version = "7.0.0-moveJobs-SNAPSHOT" +version = "7.2.0-SNAPSHOT" dependencies { api "org.json:json:${jsonObjectVersion}"