Skip to content

GH Issue 1412: Don't allow job task ids for assay types not referenced in actions #8010

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

Merged
labkey-susanh merged 2 commits into from
Sep 2, 2026
Merged

GH Issue 1412: Don't allow job task ids for assay types not referenced in actions #8010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d1e978
GH Issue 1412: Don't allow job task ids for assay types not reference…
labkey-susanh Sep 1, 2026
9b9ccbf
Add null check
labkey-susanh Sep 1, 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
2 changes: 2 additions & 0 deletions api/src/org/labkey/api/workflow/WorkflowService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ static WorkflowService get()
boolean actionWillAddSamples(Long actionId);
boolean actionWillAddSources(Long actionId);

boolean isTaskAssayType(Long taskId, Long assayId);

DataIteratorBuilder getSampleCreationDataIteratorBuilder(DataIteratorBuilder data, Container container, User user);

DataIteratorBuilder getSourceCreationDataIteratorBuilder(DataIteratorBuilder data, Container container, User user);
Expand Down
8 changes: 8 additions & 0 deletions assay/src/org/labkey/assay/actions/ImportRunApiAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,14 @@ public ApiResponse execute(ImportRunApiForm form, BindException errors) throws E
auditDetailsJsonStr = form.getAuditDetails();
}

if (workflowTaskId != null)
{
WorkflowService workService = WorkflowService.get();

if (workService != null && protocol != null && !workService.isTaskAssayType(workflowTaskId, protocol.getRowId()))
throw new ExperimentException("Invalid job task id " + workflowTaskId + ". Either the task does not exist or does not reference this assay type.");

@cnathe cnathe Sep 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so we weren't even validating that the workflowTaskId was an existing task before? Nice to get both of those validations here in one place.

}

if (reImportOption == null)
{
if (provider != null && protocol != null && provider.isPlateMetadataEnabled(protocol))
Expand Down