From 4312f2accd37d6afd21cf39a7c12ce3a435110e2 Mon Sep 17 00:00:00 2001
From: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
Date: Tue, 30 Apr 2024 12:19:37 -0600
Subject: [PATCH 1/2] XYChart2: Fix tooltip mode (#87147)

---
 public/app/plugins/panel/xychart/v2/XYChartPanel.tsx   | 2 +-
 public/app/plugins/panel/xychart/v2/XYChartTooltip.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/panel/xychart/v2/XYChartPanel.tsx b/public/app/plugins/panel/xychart/v2/XYChartPanel.tsx
index f52b6766ef0..54caeda8db5 100644
--- a/public/app/plugins/panel/xychart/v2/XYChartPanel.tsx
+++ b/public/app/plugins/panel/xychart/v2/XYChartPanel.tsx
@@ -38,7 +38,7 @@ export const XYChartPanel2 = (props: Props2) => {
   let { builder, prepData } = useMemo(
     () => prepConfig(series, config.theme2),
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [mapping, mappedSeries, props.data.structureRev, props.fieldConfig]
+    [mapping, mappedSeries, props.data.structureRev, props.fieldConfig, props.options.tooltip]
   );
 
   // generate data struct for uPlot mode: 2
diff --git a/public/app/plugins/panel/xychart/v2/XYChartTooltip.tsx b/public/app/plugins/panel/xychart/v2/XYChartTooltip.tsx
index bfc25494772..e47d1c531f4 100644
--- a/public/app/plugins/panel/xychart/v2/XYChartTooltip.tsx
+++ b/public/app/plugins/panel/xychart/v2/XYChartTooltip.tsx
@@ -24,7 +24,7 @@ export interface Props {
 }
 
 function stripSeriesName(fieldName: string, seriesName: string) {
-  if (fieldName.includes(' ')) {
+  if (fieldName !== seriesName && fieldName.includes(' ')) {
     fieldName = fieldName.replace(seriesName, '').trim();
   }
 

From 7ce1254913af001975ae3b9433ee2df4ae593c10 Mon Sep 17 00:00:00 2001
From: bornohin6 <153968128+bornohin6@users.noreply.github.com>
Date: Tue, 30 Apr 2024 11:44:35 -0700
Subject: [PATCH 2/2] CloudMigration: Remove details from the migration run
 list (#87104)

Remove details from the migration run list
---
 .../cloudmigrationimpl/cloudmigration.go           | 14 ++++----------
 pkg/services/cloudmigration/model.go               |  6 +++++-
 public/api-merged.json                             | 11 ++++++++++-
 public/openapi3.json                               | 11 ++++++++++-
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go
index d6bbad01a72..f0cd9b4d789 100644
--- a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go
+++ b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go
@@ -497,17 +497,11 @@ func (s *Service) GetMigrationRunList(ctx context.Context, migrationID string) (
 		return nil, fmt.Errorf("retrieving migration statuses from db: %w", err)
 	}
 
-	runList := &cloudmigration.CloudMigrationRunList{Runs: []cloudmigration.MigrateDataResponseDTO{}}
+	runList := &cloudmigration.CloudMigrationRunList{Runs: []cloudmigration.MigrateDataResponseListDTO{}}
 	for _, s := range runs {
-		// attempt to bind the raw result to a list of response item DTOs
-		r := cloudmigration.MigrateDataResponseDTO{
-			Items: []cloudmigration.MigrateDataResponseItemDTO{},
-		}
-		if err := json.Unmarshal(s.Result, &r); err != nil {
-			return nil, fmt.Errorf("error unmarshalling migration response items: %w", err)
-		}
-		r.RunID = s.ID
-		runList.Runs = append(runList.Runs, r)
+		runList.Runs = append(runList.Runs, cloudmigration.MigrateDataResponseListDTO{
+			RunID: s.ID,
+		})
 	}
 
 	return runList, nil
diff --git a/pkg/services/cloudmigration/model.go b/pkg/services/cloudmigration/model.go
index 109a9f3bd0a..3e34dab4b97 100644
--- a/pkg/services/cloudmigration/model.go
+++ b/pkg/services/cloudmigration/model.go
@@ -66,7 +66,7 @@ func (r CloudMigrationRun) ToResponse() (*MigrateDataResponseDTO, error) {
 }
 
 type CloudMigrationRunList struct {
-	Runs []MigrateDataResponseDTO `json:"runs"`
+	Runs []MigrateDataResponseListDTO `json:"runs"`
 }
 
 // swagger:parameters createMigration
@@ -176,6 +176,10 @@ type MigrateDataResponseDTO struct {
 	Items []MigrateDataResponseItemDTO `json:"items"`
 }
 
+type MigrateDataResponseListDTO struct {
+	RunID int64 `json:"id"`
+}
+
 type MigrateDataResponseItemDTO struct {
 	// required:true
 	Type MigrateDataType `json:"type"`
diff --git a/public/api-merged.json b/public/api-merged.json
index fe9e69f24cc..62858e50006 100644
--- a/public/api-merged.json
+++ b/public/api-merged.json
@@ -13067,7 +13067,7 @@
         "runs": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/MigrateDataResponseDTO"
+            "$ref": "#/definitions/MigrateDataResponseListDTO"
           }
         }
       }
@@ -16259,6 +16259,15 @@
         }
       }
     },
+    "MigrateDataResponseListDTO": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        }
+      }
+    },
     "MoveFolderCommand": {
       "description": "MoveFolderCommand captures the information required by the folder service\nto move a folder.",
       "type": "object",
diff --git a/public/openapi3.json b/public/openapi3.json
index 420d9bfa204..4c6688cc9f9 100644
--- a/public/openapi3.json
+++ b/public/openapi3.json
@@ -3689,7 +3689,7 @@
         "properties": {
           "runs": {
             "items": {
-              "$ref": "#/components/schemas/MigrateDataResponseDTO"
+              "$ref": "#/components/schemas/MigrateDataResponseListDTO"
             },
             "type": "array"
           }
@@ -6883,6 +6883,15 @@
         ],
         "type": "object"
       },
+      "MigrateDataResponseListDTO": {
+        "properties": {
+          "id": {
+            "format": "int64",
+            "type": "integer"
+          }
+        },
+        "type": "object"
+      },
       "MoveFolderCommand": {
         "description": "MoveFolderCommand captures the information required by the folder service\nto move a folder.",
         "properties": {