Skip to content

Add support for adding sources to jobs #7852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-susanh wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

Add support for adding sources to jobs #7852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1bd8b24
Add Job.getSources method
labkey-susanh Jun 30, 2026
bf1651d
New constructors
labkey-susanh Jul 1, 2026
1f4168f
Merge remote-tracking branch 'origin/develop' into fb_jobSources
labkey-susanh Jul 3, 2026
6137874
Merge remote-tracking branch 'origin/develop' into fb_jobSources
cnathe Jul 7, 2026
9886efa
minor update to error message text
cnathe Jul 7, 2026
30ed104
Merge remote-tracking branch 'origin/develop' into fb_jobSources
cnathe Jul 8, 2026
a99e4f2
Merge remote-tracking branch 'origin/develop' into fb_jobSources
cnathe Jul 9, 2026
101ca03
Merge remote-tracking branch 'origin/develop' into fb_jobSources
cnathe Jul 12, 2026
faa1700
Merge remote-tracking branch 'origin/develop' into fb_jobSources
labkey-susanh Jul 14, 2026
3ea6da8
Merge from develop and update source treatment to align with sample t…
labkey-susanh Jul 15, 2026
0e1ef30
Unused import
labkey-susanh Jul 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions api/src/org/labkey/api/workflow/Job.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -315,6 +316,12 @@ public void setAttachments(List<AttachmentFile> attachments)
@JsonIgnore
public abstract @NotNull List<String> getSampleNames();

@JsonIgnore
public abstract @NotNull List<? extends ExpData> getSources();

@JsonIgnore
public abstract @NotNull List<String> getSourceNames();

public void setEntities(List<WorkEntity> entities)
{
_entities = entities;
Expand Down
1 change: 0 additions & 1 deletion api/src/org/labkey/api/workflow/WorkEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ public WorkEntity(@NotNull Long rowId, @NotNull WorkEntity.EntityType entityType
_actionId = actionId;
}


public Long getRowId()
{
return _rowId;
Expand Down
2 changes: 1 addition & 1 deletion experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down