From 1bbbe41a6c78b322ac2a4f039e2f9eb859ad5e1e Mon Sep 17 00:00:00 2001
From: Artur Wierzbicki <wierzbicki.artur.94@gmail.com>
Date: Mon, 10 Oct 2022 22:05:16 +0400
Subject: [PATCH] Search: wrap data.Frame in a backend.DataResponse and return
 it directly when the index is not ready (#56611)

---
 pkg/services/searchV2/http.go | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkg/services/searchV2/http.go b/pkg/services/searchV2/http.go
index 51f5c5e5b7a..0d1da01ad83 100644
--- a/pkg/services/searchV2/http.go
+++ b/pkg/services/searchV2/http.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"io"
 
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/api/routing"
@@ -36,14 +37,12 @@ func (s *searchHTTPService) doQuery(c *models.ReqContext) response.Response {
 			"reason": searchReadinessCheckResp.Reason,
 		}).Inc()
 
-		bytes, err := (&data.Frame{
-			Name: "Loading",
-		}).MarshalJSON()
-
-		if err != nil {
-			return response.Error(500, "error marshalling response", err)
-		}
-		return response.JSON(200, bytes)
+		return response.JSON(200, &backend.DataResponse{
+			Frames: []*data.Frame{{
+				Name: "Loading",
+			}},
+			Error: nil,
+		})
 	}
 
 	body, err := io.ReadAll(c.Req.Body)