root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 93 Packages Projects Releases Wiki Activity

[search] set folder; case insensitive sort (#98335) 

* [search] set folder
* sort case insensitive
* fix test
This commit is contained in:
Scott Lepper 2025-01-02 14:58:42 -05:00 committed by GitHub
parent 5a2344ed0c
commit 83bcd86d18
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/storage/unified/resource/document.go
View File

@ -166,8 +166,8 @@ func NewIndexableDocument(key *ResourceKey, rv int64, obj utils.GrafanaMetaAcces
Key: key, Key: key,
Kind: key.Resource, Kind: key.Resource,
RV: rv, RV: rv,
Title: title, // We always want *something* to display Title: title, // We always want *something* to display
TitleSort: title, TitleSort: strings.ToLower(title), // Lowercase for case-insensitive sorting
Labels: obj.GetLabels(), Labels: obj.GetLabels(),
Folder: obj.GetFolder(), Folder: obj.GetFolder(),
CreatedBy: obj.GetCreatedBy(), CreatedBy: obj.GetCreatedBy(),

2
pkg/storage/unified/search/testdata/doc/dashboard-aaa-out.json vendored
View File

@ -8,7 +8,7 @@
"kind": "dashboards", "kind": "dashboards",
"rv": 1234, "rv": 1234,
"title": "Test title", "title": "Test title",
"title_sort": "Test title", "title_sort": "test title",
"description": "test description", "description": "test description",
"tags": [ "tags": [
"a", "a",

2
pkg/storage/unified/search/testdata/doc/playlist-aaa-out.json vendored
View File

@ -8,7 +8,7 @@
"kind": "dashboards", "kind": "dashboards",
"rv": 1234, "rv": 1234,
"title": "Test AAA", "title": "Test AAA",
"title_sort": "Test AAA", "title_sort": "test aaa",
"created": 1731336353000, "created": 1731336353000,
"createdBy": "user:t000000001", "createdBy": "user:t000000001",
"repository": { "repository": {

2
pkg/storage/unified/search/testdata/doc/report-aaa-out.json vendored
View File

@ -8,7 +8,7 @@
"kind": "dashboards", "kind": "dashboards",
"rv": 1234, "rv": 1234,
"title": "Test AAA", "title": "Test AAA",
"title_sort": "Test AAA", "title_sort": "test aaa",
"created": 1706690655000, "created": 1706690655000,
"createdBy": "user:abc", "createdBy": "user:abc",
"repository": { "repository": {

4
public/app/features/search/service/unified.ts
View File

@ -206,6 +206,10 @@ export class UnifiedSearcher implements GrafanaSearcher {
uri += `?query=${encodeURIComponent(query.query ?? '*')}`; uri += `?query=${encodeURIComponent(query.query ?? '*')}`;
uri += `&limit=${query.limit ?? pageSize}`; uri += `&limit=${query.limit ?? pageSize}`;
if (!isEmpty(query.location)) {
uri += `&folder=${query.location}`;
}
if (query.kind) { if (query.kind) {
// filter resource types // filter resource types
uri += '&' + query.kind.map((kind) => `type=${kind}`).join('&'); uri += '&' + query.kind.map((kind) => `type=${kind}`).join('&');