@grafana/scenes 5.34.0 → 5.35.0--canary.1007.12374452740.0

package/dist/index.js

@@ -716,9 +716,12 @@ function parseUrlParam(value) {
   return null;
 }
 
-function evaluateTimeRange(from, to, timeZone, fiscalYearStartMonth, delay) {
+function evaluateTimeRange(from, to, timeZone, fiscalYearStartMonth, delay, weekStart) {
   const hasDelay = delay && to === "now";
   const now = Date.now();
+  if (weekStart) {
+    setWeekStartIfDifferent(weekStart);
+  }
   const parseOrToDateTime = (val, options) => {
     if (data.dateMath.toDateTime) {
       return data.dateMath.toDateTime(val, options);
@@ -745,6 +748,13 @@ function evaluateTimeRange(from, to, timeZone, fiscalYearStartMonth, delay) {
     }
   };
 }
+let prevWeekStart;
+function setWeekStartIfDifferent(weekStart) {
+  if (weekStart !== prevWeekStart) {
+    prevWeekStart = weekStart;
+    data.setWeekStart(weekStart);
+  }
+}
 
 function isValid$1(value, roundUp, timeZone) {
   if (data.isDateTime(value)) {
@@ -784,7 +794,8 @@ class SceneTimeRange extends SceneObjectBase {
       to,
       timeZone || data.getTimeZone(),
       state.fiscalYearStartMonth,
-      state.UNSAFE_nowDelay
+      state.UNSAFE_nowDelay,
+      state.weekStart
     );
     const refreshOnActivate = (_a = state.refreshOnActivate) != null ? _a : { percent: 10 };
     super(__spreadValues$K({ from, to, timeZone, value, refreshOnActivate }, state));
@@ -806,7 +817,8 @@ class SceneTimeRange extends SceneObjectBase {
         update.to,
         this.getTimeZone(),
         this.state.fiscalYearStartMonth,
-        this.state.UNSAFE_nowDelay
+        this.state.UNSAFE_nowDelay,
+        this.state.weekStart
       );
       if (update.from !== this.state.from || update.to !== this.state.to) {
         this._urlSync.performBrowserHistoryAction(() => {
@@ -820,15 +832,7 @@ class SceneTimeRange extends SceneObjectBase {
       });
     };
     this.onRefresh = () => {
-      this.setState({
-        value: evaluateTimeRange(
-          this.state.from,
-          this.state.to,
-          this.getTimeZone(),
-          this.state.fiscalYearStartMonth,
-          this.state.UNSAFE_nowDelay
-        )
-      });
+      this.refreshRange(0);
       this.publishEvent(new runtime.RefreshEvent(), true);
     };
     this.addActivationHandler(this._onActivate.bind(this));
@@ -840,23 +844,12 @@ class SceneTimeRange extends SceneObjectBase {
         this._subs.add(
           timeZoneSource.subscribeToState((n, p) => {
             if (n.timeZone !== void 0 && n.timeZone !== p.timeZone) {
-              this.setState({
-                value: evaluateTimeRange(
-                  this.state.from,
-                  this.state.to,
-                  timeZoneSource.getTimeZone(),
-                  this.state.fiscalYearStartMonth,
-                  this.state.UNSAFE_nowDelay
-                )
-              });
+              this.refreshRange(0);
             }
           })
         );
       }
     }
-    if (this.state.weekStart) {
-      data.setWeekStart(this.state.weekStart);
-    }
     if (data.rangeUtil.isRelativeTimeRange(this.state.value.raw)) {
       this.refreshIfStale();
     }
@@ -901,13 +894,12 @@ class SceneTimeRange extends SceneObjectBase {
       this.state.to,
       (_a = this.state.timeZone) != null ? _a : data.getTimeZone(),
       this.state.fiscalYearStartMonth,
-      this.state.UNSAFE_nowDelay
+      this.state.UNSAFE_nowDelay,
+      this.state.weekStart
     );
     const diff = value.to.diff(this.state.value.to, "milliseconds");
     if (diff >= refreshAfterMs) {
-      this.setState({
-        value
-      });
+      this.setState({ value });
     }
   }
   calculatePercentOfInterval(percent) {
@@ -966,7 +958,8 @@ class SceneTimeRange extends SceneObjectBase {
       (_b = update.to) != null ? _b : this.state.to,
       (_c = update.timeZone) != null ? _c : this.getTimeZone(),
       this.state.fiscalYearStartMonth,
-      this.state.UNSAFE_nowDelay
+      this.state.UNSAFE_nowDelay,
+      this.state.weekStart
     );
     return this.setState(update);
   }
@@ -6105,12 +6098,6 @@ const hasCustomVariableSupport = (datasource) => {
   const variableSupport = datasource.variables;
   return "query" in variableSupport && "editor" in variableSupport && Boolean(variableSupport.query) && Boolean(variableSupport.editor);
 };
-const hasDataSourceVariableSupport = (datasource) => {
-  if (!datasource.variables) {
-    return false;
-  }
-  return datasource.variables.getType() === data.VariableSupportType.Datasource;
-};
 
 var __defProp$w = Object.defineProperty;
 var __defProps$k = Object.defineProperties;
@@ -6206,29 +6193,6 @@ class CustomQueryRunner {
     return this._runRequest(this.datasource, request, this.datasource.variables.query.bind(this.datasource.variables));
   }
 }
-const variableDummyRefId = "variable-query";
-class DatasourceQueryRunner {
-  constructor(datasource, _runRequest = runtime.getRunRequest()) {
-    this.datasource = datasource;
-    this._runRequest = _runRequest;
-  }
-  getTarget(variable) {
-    var _a;
-    if (hasDataSourceVariableSupport(this.datasource)) {
-      if (typeof variable.state.query === "string") {
-        return variable.state.query;
-      }
-      return __spreadProps$k(__spreadValues$w({}, variable.state.query), { refId: (_a = variable.state.query.refId) != null ? _a : variableDummyRefId });
-    }
-    throw new Error("Couldn't create a target with supplied arguments.");
-  }
-  runRequest(_, request) {
-    if (!hasDataSourceVariableSupport(this.datasource)) {
-      return getEmptyMetricFindValueObservable();
-    }
-    return this._runRequest(this.datasource, request, this.datasource.query);
-  }
-}
 function getEmptyMetricFindValueObservable() {
   return rxjs.of({ state: data.LoadingState.Done, series: [], timeRange: data.getDefaultTimeRange() });
 }
@@ -6242,9 +6206,6 @@ function createQueryVariableRunnerFactory(datasource) {
   if (hasCustomVariableSupport(datasource)) {
     return new CustomQueryRunner(datasource);
   }
-  if (hasDataSourceVariableSupport(datasource)) {
-    return new DatasourceQueryRunner(datasource);
-  }
   throw new Error(`Couldn't create a query runner for datasource ${datasource.type}`);
 }
 let createQueryVariableRunner = createQueryVariableRunnerFactory;
@@ -7596,7 +7557,8 @@ class VizPanel extends SceneObjectBase {
           sceneTimeRange.state.to,
           sceneTimeRange.getTimeZone(),
           sceneTimeRange.state.fiscalYearStartMonth,
-          sceneTimeRange.state.UNSAFE_nowDelay
+          sceneTimeRange.state.UNSAFE_nowDelay,
+          sceneTimeRange.state.weekStart
         );
       }
       const plugin = this.getPlugin();
@@ -8707,7 +8669,8 @@ class SceneTimeZoneOverride extends SceneTimeRangeTransformerBase {
         timeRange.to,
         this.state.timeZone,
         timeRange.fiscalYearStartMonth,
-        timeRange.UNSAFE_nowDelay
+        timeRange.UNSAFE_nowDelay,
+        timeRange.weekStart
       )
     }));
   }
@@ -8715,14 +8678,16 @@ class SceneTimeZoneOverride extends SceneTimeRangeTransformerBase {
     return this.state.timeZone;
   }
   onTimeZoneChange(timeZone) {
+    const parentTimeRange = this.getAncestorTimeRange();
     this.setState({
       timeZone,
       value: evaluateTimeRange(
-        this.state.from,
-        this.state.to,
-        this.state.timeZone,
-        this.getAncestorTimeRange().state.fiscalYearStartMonth,
-        this.state.UNSAFE_nowDelay
+        parentTimeRange.state.from,
+        parentTimeRange.state.to,
+        timeZone,
+        parentTimeRange.state.fiscalYearStartMonth,
+        parentTimeRange.state.UNSAFE_nowDelay,
+        parentTimeRange.state.weekStart
       )
     });
   }