From 32a4cc45bfb373cea9f1c2b6ebe7b09b2a64292f Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Thu, 2 May 2024 16:52:47 +0300
Subject: [PATCH] [v11.0.x] DashboardScene: adjust lib panel as a dashboard
 datasource refresh logic (#87232)

DashboardScene: adjust lib panel as a dashboard datasource refresh logic (#87120)

* activate library viz panel and adjust id extractor

* revert parts that are fixed in #87125

* clean up after activation handler

(cherry picked from commit afbd02c4ecfa1d0b2367da47c138c13c4f0400fc)

Co-authored-by: Sergej-Vlasov <37613182+Sergej-Vlasov@users.noreply.github.com>
---
 .../scene/DashboardDatasourceBehaviour.tsx       | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.tsx b/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.tsx
index f45d57f2742..d8746198e00 100644
--- a/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.tsx
+++ b/public/app/features/dashboard-scene/scene/DashboardDatasourceBehaviour.tsx
@@ -1,6 +1,12 @@
 import { Unsubscribable } from 'rxjs';
 
-import { SceneObjectBase, SceneObjectState, SceneQueryRunner, VizPanel } from '@grafana/scenes';
+import {
+  CancelActivationHandler,
+  SceneObjectBase,
+  SceneObjectState,
+  SceneQueryRunner,
+  VizPanel,
+} from '@grafana/scenes';
 import { SHARED_DASHBOARD_QUERY } from 'app/plugins/datasource/dashboard';
 
 import { findVizPanelByKey, getDashboardSceneFor, getQueryRunnerFor, getVizPanelKeyForPanelId } from '../utils/utils';
@@ -53,10 +59,15 @@ export class DashboardDatasourceBehaviour extends SceneObjectBase<DashboardDatas
 
     const sourcePanelQueryRunner = getQueryRunnerFor(panel);
 
+    let parentLibPanelCleanUp: undefined | CancelActivationHandler;
+
     if (!sourcePanelQueryRunner) {
       if (!(panel.parent instanceof LibraryVizPanel)) {
         throw new Error('Could not find SceneQueryRunner for panel');
       } else {
+        if (!panel.parent.isActive) {
+          parentLibPanelCleanUp = panel.parent.activate();
+        }
         // Library panels load and create internal viz panel asynchroniously. Here we are subscribing to
         // library panel state, and run dashboard queries when the source panel query runner is ready.
         libraryPanelSub = panel.parent.subscribeToState((n, p) => {
@@ -74,6 +85,9 @@ export class DashboardDatasourceBehaviour extends SceneObjectBase<DashboardDatas
       if (libraryPanelSub) {
         libraryPanelSub.unsubscribe();
       }
+      if (parentLibPanelCleanUp) {
+        parentLibPanelCleanUp();
+      }
     };
   }