From c03cd22431bec5ce9b0a2bacb124953b79c3de54 Mon Sep 17 00:00:00 2001 From: Diego Augusto Molina Date: Tue, 15 Oct 2024 10:07:56 -0300 Subject: [PATCH] [v11.0.x] Dashboard: Make dashboard search faster (#94702) * Dashboard: Make dashboard search faster (#88019) (cherry picked from commit 28992f0488e0555493041675ee30f77b9442ab94) * fix cherry-pick leftover --------- Co-authored-by: knuzhdin <32521427+knuzhdin@users.noreply.github.com> --- pkg/services/dashboards/database/database.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/services/dashboards/database/database.go b/pkg/services/dashboards/database/database.go index 04b4354922c..98dbfacb8ce 100644 --- a/pkg/services/dashboards/database/database.go +++ b/pkg/services/dashboards/database/database.go @@ -751,9 +751,7 @@ func (d *dashboardStore) FindDashboards(ctx context.Context, query *dashboards.F return nil, err } - filters := []any{ - permissions.NewAccessControlDashboardPermissionFilter(query.SignedInUser, query.Permission, query.Type, d.features, recursiveQueriesAreSupported), - } + filters := []any{} for _, filter := range query.Sort.Filter { filters = append(filters, filter) @@ -802,6 +800,8 @@ func (d *dashboardStore) FindDashboards(ctx context.Context, query *dashboards.F }) } + filters = append(filters, permissions.NewAccessControlDashboardPermissionFilter(query.SignedInUser, query.Permission, query.Type, d.features, recursiveQueriesAreSupported)) + var res []dashboards.DashboardSearchProjection sb := &searchstore.Builder{Dialect: d.store.GetDialect(), Filters: filters, Features: d.features}