CHANGELOG.md

@@ -1,3 +1,16 @@
+# v6.5.2 (Thu Mar 20 2025)
+
+#### 🐛 Bug Fix
+
+- `@grafana/scenes`
+  - Scopes: Fix panels stuck in loading on scopes remove [#1079](https://github.com/grafana/scenes/pull/1079) ([@mdvictor](https://github.com/mdvictor))
+
+#### Authors: 1
+
+- Victor Marin ([@mdvictor](https://github.com/mdvictor))
+
+---
+
 # v6.5.1 (Thu Mar 20 2025)
 
 #### 🐛 Bug Fix

lerna.json

@@ -1,6 +1,6 @@
 {
   "npmClient": "yarn",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "packages": ["packages/*"]
 }

packages/scenes-app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "scenes-app",
   "private": true,
-  "version": "6.5.1",
+  "version": "6.5.2",
   "author": "Grafana Labs",
   "license": "AGPL-3.0-only",
   "description": "A basic grafana app plugin",

packages/scenes-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/scenes-react",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "description": "Grafana framework for building dynamic dashboards",
   "author": "Grafana Labs",
   "license": "AGPL-3.0-only",

packages/scenes/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v6.5.2 (Thu Mar 20 2025)
+
+#### 🐛 Bug Fix
+
+- Scopes: Fix panels stuck in loading on scopes remove [#1079](https://github.com/grafana/scenes/pull/1079) ([@mdvictor](https://github.com/mdvictor))
+
+#### Authors: 1
+
+- Victor Marin ([@mdvictor](https://github.com/mdvictor))
+
+---
+
 # v6.5.1 (Thu Mar 20 2025)
 
 #### 🐛 Bug Fix

packages/scenes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/scenes",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "description": "Grafana framework for building dynamic dashboards",
   "author": "Grafana Labs",
   "license": "AGPL-3.0-only",

packages/scenes/src/querying/SceneQueryRunner.test.ts

@@ -2634,6 +2634,66 @@ describe.each(['11.1.2', '11.1.1'])('SceneQueryRunner', (v) => {
       getScopesBridgeSpy.mockReturnValue(undefined);
     });
 
+    it('should run queries normaly when scopes are removed', async () => {
+      const queryRunner = new SceneQueryRunner({
+        queries: [{ refId: 'A' }],
+        $timeRange: new SceneTimeRange(),
+      });
+
+      const scopes = new SceneScopesBridge({});
+      let mockState = {
+        value: [
+          {
+            metadata: { name: 'Scope 1' },
+            spec: {
+              title: 'Scope 1',
+              type: 'test',
+              description: 'Test scope',
+              category: 'test',
+              filters: [],
+            },
+          },
+        ],
+        drawerOpened: false,
+        enabled: true,
+        loading: false,
+        readOnly: false,
+      };
+
+      scopes.updateContext({
+        state: mockState,
+        stateObservable: new BehaviorSubject(mockState),
+        changeScopes: () => {},
+        setReadOnly: () => {},
+        setEnabled: () => {},
+      });
+
+      getScopesBridgeSpy.mockReturnValue(scopes);
+
+      // mimic removing scopes: no values, loading true
+      mockState = {
+        value: [],
+        drawerOpened: false,
+        enabled: true,
+        loading: true,
+        readOnly: false,
+      };
+
+      scopes.updateContext({
+        state: mockState,
+        stateObservable: new BehaviorSubject(mockState),
+        changeScopes: () => {},
+        setReadOnly: () => {},
+        setEnabled: () => {},
+      });
+
+      queryRunner.activate();
+      await new Promise((r) => setTimeout(r, 1));
+
+      expect(sentRequest?.scopes).toBeDefined();
+      expect(sentRequest?.scopes).toEqual([]);
+    });
+
     it('should run queries with scopes when scopesBridge is provided', async () => {
       const queryRunner = new SceneQueryRunner({
         queries: [{ refId: 'A' }],

packages/scenes/src/querying/SceneQueryRunner.ts

@@ -463,8 +463,9 @@ export class SceneQueryRunner extends SceneObjectBase<QueryRunnerState> implemen
       return;
     }
 
-    // Skip executing queries if scopes are in loading state
-    if (scopesBridge?.isLoading()) {
+    // Skip executing queries if scopes are in loading state and there are values, meaning further
+    // data will be received after scope filters are loaded
+    if (scopesBridge?.isLoading() && scopesBridge?.getValue().length) {
       writeSceneLog('SceneQueryRunner', 'Scopes are in loading state, skipping query execution');
       this.setState({ data: { ...(this.state.data ?? emptyPanelData), state: LoadingState.Loading } });
       return;

packages/scenes/src/querying/__snapshots__/SceneQueryRunner.test.ts.snap

@@ -57,7 +57,7 @@ exports[`SceneQueryRunner when running query should build DataQueryRequest objec
     "from": "now-6h",
     "to": "now",
   },
-  "requestId": "SQR182",
+  "requestId": "SQR183",
   "scopes": undefined,
   "startTime": 1689063488000,
   "targets": [