Stowage/dependency-track
2
0
Fork 0
mirror of https://github.com/DependencyTrack/dependency-track.git synced 2025-11-01 06:00:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat: allow name based filtering in tag view

Browse source 
Signed-off-by: Pinto Spindler, Stephan <25225092+s-spindler@users.noreply.github.com>
This commit is contained in:
Pinto Spindler, Stephan 2022-07-16 00:28:09 +02:00
parent 6a88d9f9ba
commit 0924197d7e
2 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/org/dependencytrack/persistence/ProjectQueryManager.java
View file

@ -92,7 +92,12 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
final String filterString = ".*" + filter.toLowerCase() + ".*";
final Tag tag = getTagByName(filter.trim());
filterBuilder = filterBuilder.withFuzzyName(filterString, tag);
if (tag != null) {
filterBuilder = filterBuilder.withFuzzyNameOrExactTag(filterString, tag);
} else {
filterBuilder = filterBuilder.withFuzzyName(filterString);
}
}
final String queryFilter = filterBuilder.buildFilter();
@ -226,10 +231,15 @@ final class ProjectQueryManager extends QueryManager implements IQueryManager {
query.setOrdering("name asc");
}
final var filterBuilder = new ProjectQueryFilterBuilder()
var filterBuilder = new ProjectQueryFilterBuilder()
.excludeInactive(excludeInactive)
.withTag(tag);
if (filter != null) {
final String filterString = ".*" + filter.toLowerCase() + ".*";
filterBuilder = filterBuilder.withFuzzyName(filterString);
}
final String queryFilter = filterBuilder.buildFilter();
final Map<String, Object> params = filterBuilder.getParams();