Skip to content

Validate that trigger configurations must include a file pattern. #7702

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-klum wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Validate that trigger configurations must include a file pattern. #7702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ae0ac6
Address potential issues with file watcher listener registration that…
labkey-klum May 21, 2026
df18d54
Merge branch 'develop' into fb_filewatcher_improvements
labkey-klum May 26, 2026
c7716e4
Merge branch 'develop' into fb_filewatcher_improvements
labkey-klum May 26, 2026
efb343f
check for blank
labkey-klum May 27, 2026
9b6a983
Merge branch 'develop' into fb_filewatcher_improvements
labkey-klum May 28, 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: 1 addition & 1 deletion pipeline/src/org/labkey/pipeline/analysis/FileAnalysisTaskPipelineImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public class FileAnalysisTaskPipelineImpl extends TaskPipelineImpl<FileAnalysisT
private static final List<Field<?>> _defaultFields = List.of(
new TextField("location", "Location to Watch", "./", false, null, LOCATION_HELP_TEXT, LOCATION_HREF),
new CheckboxField("recursive", "Include Child Folders", false, false),
new TextField("filePattern", "File Pattern", "(^\\D*)\\.(?:tsv|txt|xls|xlsx)", false, null, FILE_PATTERN_HELP_TEXT, FILE_PATTERN_HREF),
new TextField("filePattern", "File Pattern", "(^\\D*)\\.(?:tsv|txt|xls|xlsx)", true, null, FILE_PATTERN_HELP_TEXT, FILE_PATTERN_HREF),
new NumberField("quiet", "Quiet Period (Seconds)", null, true, 1.0, QUIET_HELP_TEXT, QUIET_HREF),
new TextField("moveContainer", "Move to Container", "/Other Project/Subfolder A", false, null, MOVE_CONTAINER_HELP_TEXT, MOVE_CONTAINER_HREF),
new TextField("moveDirectory", "Move to Subdirectory", "My Watched Files/Move", false, null, MOVE_DIRECTORY_HELP_TEXT, MOVE_DIRECTORY_HREF),
Expand Down
9 changes: 8 additions & 1 deletion pipeline/src/org/labkey/pipeline/api/PipelineManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,8 +698,15 @@ public static void validateTriggerConfiguration(TriggerConfiguration config, Con
String pipelineId = config.getPipelineId();
boolean isEnabled = config.isEnabled();

// validate that the file regular expression is not blank
if (StringUtils.isBlank(config.getFilePattern()))
{
errors.rejectValue("FilePattern", null, "File Pattern cannot be blank.");
return;
}

// validate that the config name is unique for this container
if (StringUtils.isNotEmpty(name))
if (StringUtils.isNotBlank(name))
{
if (name.length() > 255)
errors.rejectValue("Name", null, "Name must be less than 256 characters");
Expand Down