From a7928dc191c480844848de59ba60bfc54610aa27 Mon Sep 17 00:00:00 2001
From: XingY <xyang@labkey.com>
Date: Mon, 13 Jul 2026 13:21:10 -0700
Subject: [PATCH] GitHub Issue 1282: add getJobNames to reduce memory usage
 GitHub Issue 1309: check sampleId scope

---
 api/src/org/labkey/api/workflow/Job.java        |  3 +++
 api/src/org/labkey/api/workflow/WorkEntity.java | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/api/src/org/labkey/api/workflow/Job.java b/api/src/org/labkey/api/workflow/Job.java
index e6e69ece55d..90c2b5d5e05 100644
--- a/api/src/org/labkey/api/workflow/Job.java
+++ b/api/src/org/labkey/api/workflow/Job.java
@@ -312,6 +312,9 @@ public void setAttachments(List<AttachmentFile> attachments)
     @JsonIgnore
     public abstract @NotNull List<? extends ExpMaterial> getSamples();
 
+    @JsonIgnore
+    public abstract @NotNull List<String> getSampleNames();
+
     public void setEntities(List<WorkEntity> entities)
     {
         _entities = entities;
diff --git a/api/src/org/labkey/api/workflow/WorkEntity.java b/api/src/org/labkey/api/workflow/WorkEntity.java
index da6534dcbef..8898a37c06b 100644
--- a/api/src/org/labkey/api/workflow/WorkEntity.java
+++ b/api/src/org/labkey/api/workflow/WorkEntity.java
@@ -19,9 +19,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
-import org.labkey.api.exp.api.ExpMaterial;
 import org.labkey.api.security.User;
 import org.labkey.api.security.UserManager;
 import org.labkey.api.util.GUID;
@@ -76,15 +76,15 @@ public WorkEntity(Map<String, Object> map)
             this.setContainerId(new GUID((String) map.get("Container")));
     }
 
-    public WorkEntity(ExpMaterial sample)
+    public WorkEntity(@NotNull Long rowId, @NotNull WorkEntity.EntityType entityType)
     {
-        _entityType = EntityType.Sample;
-        _entityValue = sample.getRowId();
+        _entityType = entityType;
+        _entityValue = rowId;
     }
 
-    public WorkEntity(ExpMaterial sample, WorkType workType, Long workRowId, @Nullable Long actionId)
+    public WorkEntity(@NotNull Long rowId, @NotNull WorkEntity.EntityType entityType, WorkType workType, Long workRowId, @Nullable Long actionId)
     {
-        this(sample);
+        this(rowId, entityType);
         _workType = workType;
         _workRowId = workRowId;
         _actionId = actionId;