From 1bd8b24f71034a90bf67d489f0ea5bd3291b5960 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 30 Jun 2026 16:17:12 -0700 Subject: [PATCH 1/4] Add Job.getSources method --- api/src/org/labkey/api/workflow/Job.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api/src/org/labkey/api/workflow/Job.java b/api/src/org/labkey/api/workflow/Job.java index e6e69ece55d..771b29eae1b 100644 --- a/api/src/org/labkey/api/workflow/Job.java +++ b/api/src/org/labkey/api/workflow/Job.java @@ -27,6 +27,7 @@ import org.labkey.api.exp.Lsid; import org.labkey.api.exp.ObjectProperty; import org.labkey.api.exp.PropertyDescriptor; +import org.labkey.api.exp.api.ExpData; import org.labkey.api.exp.api.ExpMaterial; import org.labkey.api.query.ValidationException; import org.labkey.api.security.Group; @@ -312,6 +313,9 @@ public void setAttachments(List attachments) @JsonIgnore public abstract @NotNull List getSamples(); + @JsonIgnore + public abstract @NotNull List getSources(); + public void setEntities(List entities) { _entities = entities; From bf1651d5d6ec48231ae510d95ae8f78b0cb83bd2 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 1 Jul 2026 14:27:08 -0700 Subject: [PATCH 2/4] New constructors --- api/src/org/labkey/api/workflow/WorkEntity.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/api/src/org/labkey/api/workflow/WorkEntity.java b/api/src/org/labkey/api/workflow/WorkEntity.java index da6534dcbef..fe76d16d5b5 100644 --- a/api/src/org/labkey/api/workflow/WorkEntity.java +++ b/api/src/org/labkey/api/workflow/WorkEntity.java @@ -21,6 +21,7 @@ import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; import org.json.JSONObject; +import org.labkey.api.exp.api.ExpData; import org.labkey.api.exp.api.ExpMaterial; import org.labkey.api.security.User; import org.labkey.api.security.UserManager; @@ -76,12 +77,27 @@ public WorkEntity(Map map) this.setContainerId(new GUID((String) map.get("Container"))); } + public WorkEntity(WorkType workType, Long workRowId, EntityType entityType, Long entityValue, Long actionId) + { + _workType = workType; + _workRowId = workRowId; + _entityType = entityType; + _entityValue = entityValue; + _actionId = actionId; + } + public WorkEntity(ExpMaterial sample) { _entityType = EntityType.Sample; _entityValue = sample.getRowId(); } + public WorkEntity(ExpData source) + { + _entityType = EntityType.Source; + _entityValue = source.getRowId(); + } + public WorkEntity(ExpMaterial sample, WorkType workType, Long workRowId, @Nullable Long actionId) { this(sample); From 9886efa3ef46294afccc4eea11b6c424ff2549b1 Mon Sep 17 00:00:00 2001 From: cnathe Date: Tue, 7 Jul 2026 15:26:06 -0500 Subject: [PATCH 3/4] minor update to error message text --- .../labkey/experiment/controllers/exp/ExperimentController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java b/experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java index d5179234b47..93211baf5d7 100644 --- a/experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java +++ b/experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java @@ -8133,7 +8133,7 @@ public void validateForm(CrossFolderSelectionForm form, Errors errors) if (form.getDataRegionSelectionKey() == null && form.getRowIds() == null) errors.reject(ERROR_REQUIRED, "You must provide either a set of rowIds or a dataRegionSelectionKey."); if (!"samples".equalsIgnoreCase(form.getDataType()) && !"exp.data".equalsIgnoreCase(form.getDataType())&& !"assay".equalsIgnoreCase(form.getDataType())) - errors.reject(ERROR_REQUIRED, "Data type (sample, data or assayrun) must be specified."); + errors.reject(ERROR_REQUIRED, "Data type (samples, exp.data or assay) must be specified."); } @Override From 0e1ef30a49d00d7d7385353f6f923f634c62aae5 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 15 Jul 2026 09:44:25 -0700 Subject: [PATCH 4/4] Unused import --- api/src/org/labkey/api/workflow/WorkEntity.java | 1 - 1 file changed, 1 deletion(-) diff --git a/api/src/org/labkey/api/workflow/WorkEntity.java b/api/src/org/labkey/api/workflow/WorkEntity.java index 9aae3826226..cf878e701a0 100644 --- a/api/src/org/labkey/api/workflow/WorkEntity.java +++ b/api/src/org/labkey/api/workflow/WorkEntity.java @@ -22,7 +22,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.json.JSONObject; -import org.labkey.api.exp.api.ExpData; import org.labkey.api.security.User; import org.labkey.api.security.UserManager; import org.labkey.api.util.GUID;