From fd4e08b511cefb8aa818ffed505cfe9e0feeb630 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Thu, 23 Oct 2025 17:58:24 +0200 Subject: [PATCH] [release-12.0.7] Dashboards: Return the correct model in openapi spec (#112869) Return the correct model (#112858) (cherry picked from commit 0ba040e866e1493baf09551ae845e8e2666483b6) Co-authored-by: Selene --- pkg/api/dashboard.go | 2 +- public/api-merged.json | 19 +++++++++++++++---- public/openapi3.json | 19 +++++++++++++++---- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 3ad8335151d..85528d58e87 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -1305,7 +1305,7 @@ type GetHomeDashboardResponseBody struct { // swagger:response dashboardVersionsResponse type DashboardVersionsResponse struct { // in: body - Body []dashver.DashboardVersionMeta `json:"body"` + Body *dashver.DashboardVersionResponseMeta `json:"body"` } // swagger:response dashboardVersionResponse diff --git a/public/api-merged.json b/public/api-merged.json index a43d317fe11..05f49ae213c 100644 --- a/public/api-merged.json +++ b/public/api-merged.json @@ -12175,6 +12175,20 @@ } } }, + "DashboardVersionResponseMeta": { + "type": "object", + "properties": { + "continueToken": { + "type": "string" + }, + "versions": { + "type": "array", + "items": { + "$ref": "#/definitions/DashboardVersionMeta" + } + } + } + }, "DataLink": { "description": "DataLink define what", "type": "object", @@ -20424,10 +20438,7 @@ "dashboardVersionsResponse": { "description": "(empty)", "schema": { - "type": "array", - "items": { - "$ref": "#/definitions/DashboardVersionMeta" - } + "$ref": "#/definitions/DashboardVersionResponseMeta" } }, "deleteCorrelationResponse": { diff --git a/public/openapi3.json b/public/openapi3.json index e56c9fa21a2..a9e89c4d169 100644 --- a/public/openapi3.json +++ b/public/openapi3.json @@ -401,10 +401,7 @@ "content": { "application/json": { "schema": { - "items": { - "$ref": "#/components/schemas/DashboardVersionMeta" - }, - "type": "array" + "$ref": "#/components/schemas/DashboardVersionResponseMeta" } } }, @@ -4186,6 +4183,20 @@ }, "type": "object" }, + "DashboardVersionResponseMeta": { + "properties": { + "continueToken": { + "type": "string" + }, + "versions": { + "items": { + "$ref": "#/components/schemas/DashboardVersionMeta" + }, + "type": "array" + } + }, + "type": "object" + }, "DataLink": { "description": "DataLink define what", "properties": {