From 64d05e009ac5c595b1770f70cb5f44b6cbe23f90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Jamr=C3=B3z?= <pm.jamroz@gmail.com>
Date: Wed, 15 Nov 2023 21:56:21 +0100
Subject: [PATCH] Correlations: Ensure datasource uid property exists when a
 link is created (#78167)

Ensure datasource uid property exists
---
 public/app/features/correlations/utils.test.ts | 2 ++
 public/app/features/correlations/utils.ts      | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/app/features/correlations/utils.test.ts b/public/app/features/correlations/utils.test.ts
index 25b5b682a00..8b19bf02164 100644
--- a/public/app/features/correlations/utils.test.ts
+++ b/public/app/features/correlations/utils.test.ts
@@ -19,6 +19,7 @@ describe('correlations utils', () => {
           datasourceUid: prometheus.uid,
           datasourceName: prometheus.name,
           query: {
+            datasource: { uid: prometheus.uid },
             expr: 'target Prometheus query',
           },
         },
@@ -29,6 +30,7 @@ describe('correlations utils', () => {
           datasourceUid: elastic.uid,
           datasourceName: elastic.name,
           query: {
+            datasource: { uid: elastic.uid },
             expr: 'target Elastic query',
           },
         },
diff --git a/public/app/features/correlations/utils.ts b/public/app/features/correlations/utils.ts
index 14abefccc0d..09cba67f87e 100644
--- a/public/app/features/correlations/utils.ts
+++ b/public/app/features/correlations/utils.ts
@@ -54,9 +54,10 @@ const decorateDataFrameWithInternalDataLinks = (dataFrame: DataFrame, correlatio
     field.config.links = field.config.links?.filter((link) => link.origin !== DataLinkConfigOrigin.Correlations) || [];
     correlations.map((correlation) => {
       if (correlation.config?.field === field.name) {
+        const targetQuery = correlation.config?.target || {};
         field.config.links!.push({
           internal: {
-            query: correlation.config?.target,
+            query: { ...targetQuery, datasource: { uid: correlation.target.uid } },
             datasourceUid: correlation.target.uid,
             datasourceName: correlation.target.name,
             transformations: correlation.config?.transformations,