Merge pull request #6173 from effective-webwork/filter-menu

Improve suggestions for properties in filter menu
kitodo · Sep 2, 2024 · c7af10b · c7af10b
2 parents e1181b4 + cd24ac1
commit c7af10b
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/Kitodo/src/main/java/org/kitodo/production/filters/FilterMenu.java b/Kitodo/src/main/java/org/kitodo/production/filters/FilterMenu.java
@@ -220,8 +220,7 @@ private List<Suggestion> createSuggestionsForProcessValue(FilterString category,
                 suggestions.addAll(createStringSuggestionsMatchingInput(input, filterService.initProjects(), FilterPart.VALUE));
                 break;
             case PROPERTY:
-                suggestions.addAll(createStringSuggestionsMatchingInput(input,
-                    filterService.initProcessPropertyTitles(), FilterPart.VALUE));
+                suggestions.addAll(createStringSuggestionsMatchingInput(input, initProcessPropertyTitles(), FilterPart.VALUE));
                 break;
             default:
                 // Do nothing
@@ -230,6 +229,17 @@ private List<Suggestion> createSuggestionsForProcessValue(FilterString category,
         return suggestions;
     }
 
+    /**
+     * Get list of process properties and format them with a trailing colon.
+     *
+     * @return List of formatted process property keys
+     */
+    private List<String> initProcessPropertyTitles() {
+        return ServiceManager.getFilterService().initProcessPropertyTitles().stream()
+                .map(propertyTitle -> propertyTitle + ":")
+                .collect(Collectors.toList());
+    }
+
     private List<Suggestion> createSuggestionsForTaskValue(FilterString category, String input) {
         List<Suggestion> suggestions = new ArrayList<>();
         if (Objects.isNull(category)) {
@@ -246,8 +256,7 @@ private List<Suggestion> createSuggestionsForTaskValue(FilterString category, St
                 suggestions.addAll(createStringSuggestionsMatchingInput(input, filterService.initProjects(), FilterPart.VALUE));
                 break;
             case PROPERTY:
-                suggestions.addAll(createStringSuggestionsMatchingInput(input,
-                    filterService.initProcessPropertyTitles(), FilterPart.VALUE));
+                suggestions.addAll(createStringSuggestionsMatchingInput(input, initProcessPropertyTitles(), FilterPart.VALUE));
                 break;
             default:
                 // Do nothing