Merge branch 'add-stream-categories-to-dashboard-widgets' of github.c…

…om:Graylog2/graylog2-server into add-stream-categories-to-dashboard-widgets
Graylog2 · Sep 4, 2024 · bdde0e7 · bdde0e7
2 parents 214d17d + 8f9c033
commit bdde0e7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...a/org/graylog/plugins/views/search/engine/normalization/PluggableSearchNormalization.java b/...a/org/graylog/plugins/views/search/engine/normalization/PluggableSearchNormalization.java
@@ -76,9 +76,9 @@ private Query normalize(final Query query,
     @Override
     public Search preValidation(Search search, SearchUser searchUser, ExecutionState executionState) {
         final Search searchWithStreams = search
-                .addStreamsToQueriesWithoutStreams(() -> searchUser.streams().loadMessageStreamsWithFallback())
                 .addStreamsToQueriesWithCategories(streamCategoryMapper, searchUser)
-                .addStreamsToSearchTypesWithCategories(streamCategoryMapper, searchUser);
+                .addStreamsToSearchTypesWithCategories(streamCategoryMapper, searchUser)
+                .addStreamsToQueriesWithoutStreams(() -> searchUser.streams().loadMessageStreamsWithFallback());
         final var now = referenceDateFromOverrideOrNow(executionState);
         final var normalizedSearch = searchWithStreams.applyExecutionState(firstNonNull(executionState, ExecutionState.empty()))
                 .withReferenceDate(now);