@grafana/scenes 5.15.0 → 5.15.1

package/dist/index.js

@@ -61,8 +61,8 @@ function useAppQueryParams() {
   const location = reactRouterDom.useLocation();
   return runtime.locationSearchToObject(location.search || "");
 }
-function getUrlWithAppState(path, preserveParams) {
-  const paramsCopy = __spreadValues$O({}, runtime.locationService.getSearchObject());
+function getUrlWithAppState(path, searchObject, preserveParams) {
+  const paramsCopy = __spreadValues$O({}, searchObject);
   if (preserveParams) {
     for (const key of Object.keys(paramsCopy)) {
       if (!preserveParams.includes(key)) {
@@ -749,24 +749,19 @@ class SceneTimeRange extends SceneObjectBase {
     this._urlSync = new SceneObjectUrlSyncConfig(this, { keys: ["from", "to", "timezone", "time", "time.window"] });
     this.onTimeRangeChange = (timeRange) => {
       const update = {};
-      const updateToEval = {};
       if (typeof timeRange.raw.from === "string") {
         update.from = timeRange.raw.from;
-        updateToEval.from = timeRange.raw.from;
       } else {
         update.from = timeRange.raw.from.toISOString();
-        updateToEval.from = timeRange.raw.from.toISOString(true);
       }
       if (typeof timeRange.raw.to === "string") {
         update.to = timeRange.raw.to;
-        updateToEval.to = timeRange.raw.to;
       } else {
         update.to = timeRange.raw.to.toISOString();
-        updateToEval.to = timeRange.raw.to.toISOString(true);
       }
       update.value = evaluateTimeRange(
-        updateToEval.from,
-        updateToEval.to,
+        update.from,
+        update.to,
         this.getTimeZone(),
         this.state.fiscalYearStartMonth,
         this.state.UNSAFE_nowDelay
@@ -2188,6 +2183,9 @@ function findActiveGroupByVariablesByUid(dsUid) {
 function setBaseClassState(sceneObject, newState) {
   sceneObject.setState(newState);
 }
+function useLocationServiceSafe() {
+  return runtime.useLocationService ? runtime.useLocationService() : runtime.locationService;
+}
 
 class MultiValueVariable extends SceneObjectBase {
   constructor() {
@@ -9391,10 +9389,11 @@ class NewSceneObjectAddedEvent extends data.BusEventWithPayload {
 }
 NewSceneObjectAddedEvent.type = "new-scene-object-added";
 class UrlSyncManager {
-  constructor(_options = {}) {
+  constructor(_options = {}, locationService = runtime.locationService) {
     this._urlKeyMapper = new UniqueUrlKeyMapper();
-    this._paramsCache = new UrlParamsCache();
     this._options = _options;
+    this._locationService = locationService;
+    this._paramsCache = new UrlParamsCache(locationService);
   }
   initSync(root) {
     var _a;
@@ -9416,12 +9415,12 @@ class UrlSyncManager {
       })
     );
     this._urlKeyMapper.clear();
-    this._lastLocation = runtime.locationService.getLocation();
+    this._lastLocation = this._locationService.getLocation();
     this.handleNewObject(this._sceneRoot);
     if (this._options.updateUrlOnInit) {
       const urlState = getUrlState(root);
       if (isUrlStateDifferent(urlState, this._paramsCache.getParams())) {
-        runtime.locationService.partial(urlState, true);
+        this._locationService.partial(urlState, true);
       }
     }
   }
@@ -9463,7 +9462,7 @@ class UrlSyncManager {
       return;
     }
     const newUrlState = changedObject.urlSync.getUrlState();
-    const searchParams = runtime.locationService.getSearch();
+    const searchParams = this._locationService.getSearch();
     const mappedUpdated = {};
     for (const [key, newUrlValue] of Object.entries(newUrlState)) {
       const uniqueKey = this._urlKeyMapper.getUniqueKey(key, changedObject);
@@ -9476,8 +9475,8 @@ class UrlSyncManager {
       const shouldCreateHistoryEntry = (_b = (_a = changedObject.urlSync).shouldCreateHistoryStep) == null ? void 0 : _b.call(_a, newUrlState);
       const shouldReplace = shouldCreateHistoryEntry !== true;
       writeSceneLog("UrlSyncManager", "onStateChange updating URL");
-      runtime.locationService.partial(mappedUpdated, shouldReplace);
-      this._lastLocation = runtime.locationService.getLocation();
+      this._locationService.partial(mappedUpdated, shouldReplace);
+      this._lastLocation = this._locationService.getLocation();
     }
   }
   getUrlState(root) {
@@ -9485,12 +9484,13 @@ class UrlSyncManager {
   }
 }
 class UrlParamsCache {
-  constructor() {
+  constructor(locationService) {
+    this.locationService = locationService;
     __privateAdd(this, _cache, void 0);
     __privateAdd(this, _location, void 0);
   }
   getParams() {
-    const location = runtime.locationService.getLocation();
+    const location = this.locationService.getLocation();
     if (__privateGet(this, _location) === location) {
       return __privateGet(this, _cache);
     }
@@ -9509,33 +9509,37 @@ function isUrlStateDifferent(sceneUrlState, currentParams) {
   }
   return false;
 }
-function useUrlSyncManager(options) {
+function useUrlSyncManager(options, locationService) {
   return React.useMemo(
-    () => new UrlSyncManager({
-      updateUrlOnInit: options.updateUrlOnInit,
-      createBrowserHistorySteps: options.createBrowserHistorySteps
-    }),
-    [options.updateUrlOnInit, options.createBrowserHistorySteps]
+    () => new UrlSyncManager(
+      {
+        updateUrlOnInit: options.updateUrlOnInit,
+        createBrowserHistorySteps: options.createBrowserHistorySteps
+      },
+      locationService
+    ),
+    [options.updateUrlOnInit, options.createBrowserHistorySteps, locationService]
   );
 }
 
 function useUrlSync(sceneRoot, options = {}) {
   const location = reactRouterDom.useLocation();
+  const locationService = useLocationServiceSafe();
   const [isInitialized, setIsInitialized] = React.useState(false);
-  const urlSyncManager = useUrlSyncManager(options);
+  const urlSyncManager = useUrlSyncManager(options, locationService);
   React.useEffect(() => {
     urlSyncManager.initSync(sceneRoot);
     setIsInitialized(true);
     return () => urlSyncManager.cleanUp(sceneRoot);
   }, [sceneRoot, urlSyncManager]);
   React.useEffect(() => {
-    const latestLocation = runtime.locationService.getLocation();
+    const latestLocation = locationService.getLocation();
     const locationToHandle = latestLocation !== location ? latestLocation : location;
     if (latestLocation !== location) {
       writeSceneLog("useUrlSync", "latestLocation different from location");
     }
     urlSyncManager.handleNewLocation(locationToHandle);
-  }, [sceneRoot, urlSyncManager, location]);
+  }, [sceneRoot, urlSyncManager, location, locationService]);
   return isInitialized;
 }
 
@@ -12104,6 +12108,7 @@ function SceneAppPageView({ page, routeProps }) {
   const appContext = React.useContext(SceneAppContext);
   const isInitialized = containerState.initializedScene === scene;
   const { layout } = page.state;
+  const locationService = useLocationServiceSafe();
   React.useLayoutEffect(() => {
     if (!isInitialized) {
       containerPage.initializeScene(scene);
@@ -12120,10 +12125,13 @@ function SceneAppPageView({ page, routeProps }) {
     text: containerState.title,
     img: containerState.titleImg,
     icon: containerState.titleIcon,
-    url: getUrlWithAppState(containerState.url, containerState.preserveUrlKeys),
+    url: getUrlWithAppState(containerState.url, locationService.getSearchObject(), containerState.preserveUrlKeys),
     hideFromBreadcrumbs: containerState.hideFromBreadcrumbs,
     parentItem: getParentBreadcrumbs(
-      containerState.getParentPage ? containerState.getParentPage() : containerPage.parent)
+      containerState.getParentPage ? containerState.getParentPage() : containerPage.parent,
+      params,
+      locationService.getSearchObject()
+    )
   };
   if (containerState.tabs) {
     pageNav.children = containerState.tabs.map((tab) => {
@@ -12132,7 +12140,7 @@ function SceneAppPageView({ page, routeProps }) {
         icon: tab.state.titleIcon,
         tabSuffix: tab.state.tabSuffix,
         active: page === tab,
-        url: getUrlWithAppState(tab.state.url, tab.state.preserveUrlKeys),
+        url: getUrlWithAppState(tab.state.url, locationService.getSearchObject(), tab.state.preserveUrlKeys),
         parentItem: pageNav
       };
     });
@@ -12166,14 +12174,17 @@ function getParentPageIfTab(page) {
   }
   return page;
 }
-function getParentBreadcrumbs(parent, params) {
+function getParentBreadcrumbs(parent, params, searchObject) {
   if (parent instanceof SceneAppPage) {
     return {
       text: parent.state.title,
-      url: getUrlWithAppState(parent.state.url, parent.state.preserveUrlKeys),
+      url: getUrlWithAppState(parent.state.url, searchObject, parent.state.preserveUrlKeys),
       hideFromBreadcrumbs: parent.state.hideFromBreadcrumbs,
       parentItem: getParentBreadcrumbs(
-        parent.state.getParentPage ? parent.state.getParentPage() : parent.parent)
+        parent.state.getParentPage ? parent.state.getParentPage() : parent.parent,
+        params,
+        searchObject
+      )
     };
   }
   return void 0;