@grafana/scenes 5.0.0 → 5.0.1--canary.793.9495469697.0

package/dist/index.js

@@ -2027,14 +2027,14 @@ function syncStateFromSearchParams(root, urlParams) {
   const urlKeyMapper = new UniqueUrlKeyMapper();
   syncStateFromUrl(root, urlParams, urlKeyMapper);
 }
-function syncStateFromUrl(root, urlParams, urlKeyMapper) {
-  if (!root.parent) {
+function syncStateFromUrl(root, urlParams, urlKeyMapper, onlyChildren) {
+  if (!onlyChildren) {
     syncUrlStateToObject(root, urlParams, urlKeyMapper);
   }
   root.forEachChild((child) => {
     syncUrlStateToObject(child, urlParams, urlKeyMapper);
   });
-  root.forEachChild((child) => syncStateFromUrl(child, urlParams, urlKeyMapper));
+  root.forEachChild((child) => syncStateFromUrl(child, urlParams, urlKeyMapper, true));
 }
 function syncUrlStateToObject(sceneObject, urlParams, urlKeyMapper) {
   if (sceneObject.urlSync) {
@@ -4184,7 +4184,7 @@ class SceneQueryRunner extends SceneObjectBase {
     });
   }
   async runWithTimeRange(timeRange) {
-    var _a, _b;
+    var _a, _b, _c;
     if (!this.state.maxDataPoints && this.state.maxDataPointsFromWidth && !this._containerWidth) {
       return;
     }
@@ -4194,7 +4194,7 @@ class SceneQueryRunner extends SceneObjectBase {
     (_a = this._querySub) == null ? void 0 : _a.unsubscribe();
     if (this._variableDependency.hasDependencyInLoadingState()) {
       writeSceneLog("SceneQueryRunner", "Variable dependency is in loading state, skipping query execution");
-      this.setState({ data: __spreadProps$l(__spreadValues$x({}, this.state.data), { state: schema.LoadingState.Loading }) });
+      this.setState({ data: __spreadProps$l(__spreadValues$x({}, (_b = this.state.data) != null ? _b : emptyPanelData), { state: schema.LoadingState.Loading }) });
       return;
     }
     const { queries } = this.state;
@@ -4203,7 +4203,7 @@ class SceneQueryRunner extends SceneObjectBase {
       return;
     }
     try {
-      const datasource = (_b = this.state.datasource) != null ? _b : findFirstDatasource(queries);
+      const datasource = (_c = this.state.datasource) != null ? _c : findFirstDatasource(queries);
       const ds = await getDataSource(datasource, this._scopedVars);
       this.findAndSubscribeToAdHocFilters(datasource == null ? void 0 : datasource.uid);
       const runRequest = runtime.getRunRequest();
@@ -7806,14 +7806,12 @@ var __privateSet = (obj, member, value, setter) => {
   setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
 };
-var _urlKeyMapper, _sceneRoot, _stateSub, _lastLocation, _paramsCache, _onStateChanged, _cache, _location;
+var _onStateChanged, _cache, _location;
 class UrlSyncManager {
   constructor() {
-    __privateAdd(this, _urlKeyMapper, new UniqueUrlKeyMapper());
-    __privateAdd(this, _sceneRoot, void 0);
-    __privateAdd(this, _stateSub, null);
-    __privateAdd(this, _lastLocation, void 0);
-    __privateAdd(this, _paramsCache, new UrlParamsCache());
+    this._urlKeyMapper = new UniqueUrlKeyMapper();
+    this._stateSub = null;
+    this._paramsCache = new UrlParamsCache();
     __privateAdd(this, _onStateChanged, ({ payload }) => {
       const changedObject = payload.changedObject;
       if (changedObject.urlSync) {
@@ -7821,7 +7819,7 @@ class UrlSyncManager {
         const searchParams = runtime.locationService.getSearch();
         const mappedUpdated = {};
         for (const [key, newUrlValue] of Object.entries(newUrlState)) {
-          const uniqueKey = __privateGet(this, _urlKeyMapper).getUniqueKey(key, changedObject);
+          const uniqueKey = this._urlKeyMapper.getUniqueKey(key, changedObject);
           const currentUrlValue = searchParams.getAll(uniqueKey);
           if (!isUrlValueEqual(currentUrlValue, newUrlValue)) {
             mappedUpdated[uniqueKey] = newUrlValue;
@@ -7830,65 +7828,61 @@ class UrlSyncManager {
         if (Object.keys(mappedUpdated).length > 0) {
           writeSceneLog("UrlSyncManager", "onStateChange updating URL");
           runtime.locationService.partial(mappedUpdated, true);
-          __privateSet(this, _lastLocation, runtime.locationService.getLocation());
+          this._lastLocation = runtime.locationService.getLocation();
         }
       }
     });
   }
   initSync(root) {
     var _a;
-    if (__privateGet(this, _stateSub)) {
-      writeSceneLog("UrlSyncManager", "Unregister previous scene state subscription", (_a = __privateGet(this, _sceneRoot)) == null ? void 0 : _a.state.key);
-      __privateGet(this, _stateSub).unsubscribe();
+    if (this._stateSub) {
+      writeSceneLog("UrlSyncManager", "Unregister previous scene state subscription", (_a = this._sceneRoot) == null ? void 0 : _a.state.key);
+      this._stateSub.unsubscribe();
     }
     writeSceneLog("UrlSyncManager", "init", root.state.key);
-    __privateSet(this, _sceneRoot, root);
-    __privateSet(this, _stateSub, root.subscribeToEvent(SceneObjectStateChangedEvent, __privateGet(this, _onStateChanged)));
-    __privateGet(this, _urlKeyMapper).clear();
-    __privateSet(this, _lastLocation, runtime.locationService.getLocation());
-    this.handleNewObject(__privateGet(this, _sceneRoot));
+    this._sceneRoot = root;
+    this._stateSub = root.subscribeToEvent(SceneObjectStateChangedEvent, __privateGet(this, _onStateChanged));
+    this._urlKeyMapper.clear();
+    this._lastLocation = runtime.locationService.getLocation();
+    console.log("initSync", this._lastLocation.search);
+    this.handleNewObject(this._sceneRoot);
   }
   cleanUp(root) {
-    if (__privateGet(this, _sceneRoot) !== root) {
+    if (this._sceneRoot !== root) {
       return;
     }
     writeSceneLog("UrlSyncManager", "Clean up");
-    if (__privateGet(this, _stateSub)) {
-      __privateGet(this, _stateSub).unsubscribe();
-      __privateSet(this, _stateSub, null);
+    if (this._stateSub) {
+      this._stateSub.unsubscribe();
+      this._stateSub = null;
       writeSceneLog(
         "UrlSyncManager",
         "Root deactived, unsub to state",
         "same key",
-        __privateGet(this, _sceneRoot).state.key === root.state.key
+        this._sceneRoot.state.key === root.state.key
       );
     }
-    __privateSet(this, _sceneRoot, void 0);
-    __privateSet(this, _lastLocation, void 0);
+    this._sceneRoot = void 0;
+    this._lastLocation = void 0;
   }
   handleNewLocation(location) {
-    if (!__privateGet(this, _sceneRoot) || __privateGet(this, _lastLocation) === location) {
+    if (!this._sceneRoot || this._lastLocation === location) {
       return;
     }
     writeSceneLog("UrlSyncManager", "handleNewLocation");
-    __privateSet(this, _lastLocation, location);
-    syncStateFromUrl(__privateGet(this, _sceneRoot), __privateGet(this, _paramsCache).getParams(), __privateGet(this, _urlKeyMapper));
+    this._lastLocation = location;
+    syncStateFromUrl(this._sceneRoot, this._paramsCache.getParams(), this._urlKeyMapper);
   }
   handleNewObject(sceneObj) {
-    if (!__privateGet(this, _sceneRoot)) {
+    if (!this._sceneRoot) {
       return;
     }
-    syncStateFromUrl(sceneObj, __privateGet(this, _paramsCache).getParams(), __privateGet(this, _urlKeyMapper));
+    syncStateFromUrl(sceneObj, this._paramsCache.getParams(), this._urlKeyMapper);
   }
   getUrlState(root) {
     return getUrlState(root);
   }
 }
-_urlKeyMapper = new WeakMap();
-_sceneRoot = new WeakMap();
-_stateSub = new WeakMap();
-_lastLocation = new WeakMap();
-_paramsCache = new WeakMap();
 _onStateChanged = new WeakMap();
 class UrlParamsCache {
   constructor() {
@@ -7902,6 +7896,7 @@ class UrlParamsCache {
     }
     __privateSet(this, _location, location);
     __privateSet(this, _cache, new URLSearchParams(location.search));
+    console.log("UrlParamsCache.getParams", __privateGet(this, _cache).toString());
     return __privateGet(this, _cache);
   }
 }