Search: display sort metadata (#31167)

* Search: display metadata

* Search: update SortPicker icon

* Search: display folder meta data

* Search: reset sort picker on layout change

* Search: align tags in Card component

* Search: replace hyphen with dash

* Search: preserve sort state on layout change

* Search: update tests

* Search: fix tests

* Update pkg/services/search/hits.go

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

* Update public/app/features/search/components/SearchItem.tsx

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

* Update public/app/features/search/components/SearchItem.tsx

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

* Update public/app/features/search/types.ts

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

* Search: fix type error

* Search: add General folder name and adjust icon margin

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

pkg/services/search/hits.go

@@ -11,20 +11,21 @@ const (
 )
 
 type Hit struct {
-	ID          int64    `json:"id"`
-	UID         string   `json:"uid"`
-	Title       string   `json:"title"`
-	URI         string   `json:"uri"`
-	URL         string   `json:"url"`
-	Slug        string   `json:"slug"`
-	Type        HitType  `json:"type"`
-	Tags        []string `json:"tags"`
-	IsStarred   bool     `json:"isStarred"`
-	FolderID    int64    `json:"folderId,omitempty"`
-	FolderUID   string   `json:"folderUid,omitempty"`
-	FolderTitle string   `json:"folderTitle,omitempty"`
-	FolderURL   string   `json:"folderUrl,omitempty"`
-	SortMeta    string   `json:"sortMeta,omitempty"`
+	ID           int64    `json:"id"`
+	UID          string   `json:"uid"`
+	Title        string   `json:"title"`
+	URI          string   `json:"uri"`
+	URL          string   `json:"url"`
+	Slug         string   `json:"slug"`
+	Type         HitType  `json:"type"`
+	Tags         []string `json:"tags"`
+	IsStarred    bool     `json:"isStarred"`
+	FolderID     int64    `json:"folderId,omitempty"`
+	FolderUID    string   `json:"folderUid,omitempty"`
+	FolderTitle  string   `json:"folderTitle,omitempty"`
+	FolderURL    string   `json:"folderUrl,omitempty"`
+	SortMeta     int64    `json:"sortMeta"`
+	SortMetaName string   `json:"sortMetaName,omitempty"`
 }
 
 type HitList []*Hit

pkg/services/sqlstore/dashboard.go

@@ -1,7 +1,6 @@
 package sqlstore
 
 import (
-	"fmt"
 	"strings"
 	"time"
 
@@ -331,7 +330,8 @@ func makeQueryResult(query *search.FindPersistedDashboardsQuery, res []Dashboard
 			}
 
 			if query.Sort.MetaName != "" {
-				hit.SortMeta = strings.TrimSpace(fmt.Sprintf("%d %s", item.SortMeta, query.Sort.MetaName))
+				hit.SortMeta = item.SortMeta
+				hit.SortMetaName = query.Sort.MetaName
 			}
 
 			query.Result = append(query.Result, hit)