@grafana/scenes 6.1.3 → 6.2.0--canary.1062.13545292325.0

package/dist/index.js

@@ -41,19 +41,19 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var uFuzzy__default = /*#__PURE__*/_interopDefaultLegacy(uFuzzy);
 var ReactGridLayout__default = /*#__PURE__*/_interopDefaultLegacy(ReactGridLayout);
 
-var __defProp$R = Object.defineProperty;
-var __getOwnPropSymbols$R = Object.getOwnPropertySymbols;
-var __hasOwnProp$R = Object.prototype.hasOwnProperty;
-var __propIsEnum$R = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$R = (obj, key, value) => key in obj ? __defProp$R(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$R = (a, b) => {
+var __defProp$S = Object.defineProperty;
+var __getOwnPropSymbols$S = Object.getOwnPropertySymbols;
+var __hasOwnProp$S = Object.prototype.hasOwnProperty;
+var __propIsEnum$S = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$S = (obj, key, value) => key in obj ? __defProp$S(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$S = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$R.call(b, prop))
-      __defNormalProp$R(a, prop, b[prop]);
-  if (__getOwnPropSymbols$R)
-    for (var prop of __getOwnPropSymbols$R(b)) {
-      if (__propIsEnum$R.call(b, prop))
-        __defNormalProp$R(a, prop, b[prop]);
+    if (__hasOwnProp$S.call(b, prop))
+      __defNormalProp$S(a, prop, b[prop]);
+  if (__getOwnPropSymbols$S)
+    for (var prop of __getOwnPropSymbols$S(b)) {
+      if (__propIsEnum$S.call(b, prop))
+        __defNormalProp$S(a, prop, b[prop]);
     }
   return a;
 };
@@ -62,7 +62,7 @@ function useAppQueryParams() {
   return runtime.locationSearchToObject(location.search || "");
 }
 function getUrlWithAppState(path, searchObject, preserveParams) {
-  const paramsCopy = __spreadValues$R({}, searchObject);
+  const paramsCopy = __spreadValues$S({}, searchObject);
   if (preserveParams) {
     for (const key of Object.keys(paramsCopy)) {
       if (!preserveParams.includes(key)) {
@@ -92,21 +92,21 @@ function useSceneRouteMatch(path) {
   return match;
 }
 
-var __defProp$Q = Object.defineProperty;
+var __defProp$R = Object.defineProperty;
 var __defProps$y = Object.defineProperties;
 var __getOwnPropDescs$y = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$Q = Object.getOwnPropertySymbols;
-var __hasOwnProp$Q = Object.prototype.hasOwnProperty;
-var __propIsEnum$Q = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$Q = (obj, key, value) => key in obj ? __defProp$Q(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$Q = (a, b) => {
+var __getOwnPropSymbols$R = Object.getOwnPropertySymbols;
+var __hasOwnProp$R = Object.prototype.hasOwnProperty;
+var __propIsEnum$R = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$R = (obj, key, value) => key in obj ? __defProp$R(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$R = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$Q.call(b, prop))
-      __defNormalProp$Q(a, prop, b[prop]);
-  if (__getOwnPropSymbols$Q)
-    for (var prop of __getOwnPropSymbols$Q(b)) {
-      if (__propIsEnum$Q.call(b, prop))
-        __defNormalProp$Q(a, prop, b[prop]);
+    if (__hasOwnProp$R.call(b, prop))
+      __defNormalProp$R(a, prop, b[prop]);
+  if (__getOwnPropSymbols$R)
+    for (var prop of __getOwnPropSymbols$R(b)) {
+      if (__propIsEnum$R.call(b, prop))
+        __defNormalProp$R(a, prop, b[prop]);
     }
   return a;
 };
@@ -116,7 +116,7 @@ function registerRuntimePanelPlugin({ pluginId, plugin }) {
   if (runtimePanelPlugins.has(pluginId)) {
     throw new Error(`A runtime panel plugin with id ${pluginId} has already been registered`);
   }
-  plugin.meta = __spreadProps$y(__spreadValues$Q({}, plugin.meta), {
+  plugin.meta = __spreadProps$y(__spreadValues$R({}, plugin.meta), {
     id: pluginId,
     name: pluginId,
     module: "runtime plugin",
@@ -144,21 +144,21 @@ function loadPanelPluginSync(pluginId) {
   return (_a = getPanelPluginFromCache(pluginId)) != null ? _a : runtimePanelPlugins.get(pluginId);
 }
 
-var __defProp$P = Object.defineProperty;
+var __defProp$Q = Object.defineProperty;
 var __defProps$x = Object.defineProperties;
 var __getOwnPropDescs$x = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$P = Object.getOwnPropertySymbols;
-var __hasOwnProp$P = Object.prototype.hasOwnProperty;
-var __propIsEnum$P = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$P = (obj, key, value) => key in obj ? __defProp$P(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$P = (a, b) => {
+var __getOwnPropSymbols$Q = Object.getOwnPropertySymbols;
+var __hasOwnProp$Q = Object.prototype.hasOwnProperty;
+var __propIsEnum$Q = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$Q = (obj, key, value) => key in obj ? __defProp$Q(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$Q = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$P.call(b, prop))
-      __defNormalProp$P(a, prop, b[prop]);
-  if (__getOwnPropSymbols$P)
-    for (var prop of __getOwnPropSymbols$P(b)) {
-      if (__propIsEnum$P.call(b, prop))
-        __defNormalProp$P(a, prop, b[prop]);
+    if (__hasOwnProp$Q.call(b, prop))
+      __defNormalProp$Q(a, prop, b[prop]);
+  if (__getOwnPropSymbols$Q)
+    for (var prop of __getOwnPropSymbols$Q(b)) {
+      if (__propIsEnum$Q.call(b, prop))
+        __defNormalProp$Q(a, prop, b[prop]);
     }
   return a;
 };
@@ -166,11 +166,11 @@ var __spreadProps$x = (a, b) => __defProps$x(a, __getOwnPropDescs$x(b));
 var __objRest$5 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$P.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$Q.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$P)
-    for (var prop of __getOwnPropSymbols$P(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$P.call(source, prop))
+  if (source != null && __getOwnPropSymbols$Q)
+    for (var prop of __getOwnPropSymbols$Q(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$Q.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
@@ -188,7 +188,7 @@ function SceneComponentWrapperWithoutMemo(_a) {
   if (!model.isActive && !model.renderBeforeActivation) {
     return null;
   }
-  return /* @__PURE__ */ React__default["default"].createElement(Component, __spreadProps$x(__spreadValues$P({}, otherProps), {
+  return /* @__PURE__ */ React__default["default"].createElement(Component, __spreadProps$x(__spreadValues$Q({}, otherProps), {
     model
   }));
 }
@@ -234,19 +234,19 @@ class SceneObjectRef {
 }
 _ref = new WeakMap();
 
-var __defProp$O = Object.defineProperty;
-var __getOwnPropSymbols$O = Object.getOwnPropertySymbols;
-var __hasOwnProp$O = Object.prototype.hasOwnProperty;
-var __propIsEnum$O = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$O = (obj, key, value) => key in obj ? __defProp$O(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$O = (a, b) => {
+var __defProp$P = Object.defineProperty;
+var __getOwnPropSymbols$P = Object.getOwnPropertySymbols;
+var __hasOwnProp$P = Object.prototype.hasOwnProperty;
+var __propIsEnum$P = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$P = (obj, key, value) => key in obj ? __defProp$P(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$P = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$O.call(b, prop))
-      __defNormalProp$O(a, prop, b[prop]);
-  if (__getOwnPropSymbols$O)
-    for (var prop of __getOwnPropSymbols$O(b)) {
-      if (__propIsEnum$O.call(b, prop))
-        __defNormalProp$O(a, prop, b[prop]);
+    if (__hasOwnProp$P.call(b, prop))
+      __defNormalProp$P(a, prop, b[prop]);
+  if (__getOwnPropSymbols$P)
+    for (var prop of __getOwnPropSymbols$P(b)) {
+      if (__propIsEnum$P.call(b, prop))
+        __defNormalProp$P(a, prop, b[prop]);
     }
   return a;
 };
@@ -313,7 +313,7 @@ class SceneObjectBase {
   }
   setState(update) {
     const prevState = this._state;
-    const newState = __spreadValues$O(__spreadValues$O({}, this._state), update);
+    const newState = __spreadValues$P(__spreadValues$P({}, this._state), update);
     this._state = Object.freeze(newState);
     this._setParent(update);
     this._handleActivationOfChangedStateProps(prevState, newState);
@@ -509,19 +509,19 @@ function forEachChild(state, callback) {
   }
 }
 
-var __defProp$N = Object.defineProperty;
-var __getOwnPropSymbols$N = Object.getOwnPropertySymbols;
-var __hasOwnProp$N = Object.prototype.hasOwnProperty;
-var __propIsEnum$N = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$N = (obj, key, value) => key in obj ? __defProp$N(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$N = (a, b) => {
+var __defProp$O = Object.defineProperty;
+var __getOwnPropSymbols$O = Object.getOwnPropertySymbols;
+var __hasOwnProp$O = Object.prototype.hasOwnProperty;
+var __propIsEnum$O = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$O = (obj, key, value) => key in obj ? __defProp$O(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$O = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$N.call(b, prop))
-      __defNormalProp$N(a, prop, b[prop]);
-  if (__getOwnPropSymbols$N)
-    for (var prop of __getOwnPropSymbols$N(b)) {
-      if (__propIsEnum$N.call(b, prop))
-        __defNormalProp$N(a, prop, b[prop]);
+    if (__hasOwnProp$O.call(b, prop))
+      __defNormalProp$O(a, prop, b[prop]);
+  if (__getOwnPropSymbols$O)
+    for (var prop of __getOwnPropSymbols$O(b)) {
+      if (__propIsEnum$O.call(b, prop))
+        __defNormalProp$O(a, prop, b[prop]);
     }
   return a;
 };
@@ -530,35 +530,30 @@ function cloneSceneObject(sceneObject, withState) {
   return new sceneObject.constructor(clonedState);
 }
 function cloneSceneObjectState(sceneState, withState) {
-  const clonedState = __spreadValues$N({}, sceneState);
+  const clonedState = __spreadValues$O({}, sceneState);
   Object.assign(clonedState, withState);
   for (const key in clonedState) {
     if (withState && withState[key] !== void 0) {
       continue;
     }
     const propValue = clonedState[key];
+    if (propValue instanceof SceneObjectBase) {
+      clonedState[key] = propValue.clone();
+    }
     if (propValue instanceof SceneObjectRef) {
       console.warn("Cloning object with SceneObjectRef");
       continue;
     }
-    if (propValue instanceof SceneObjectBase) {
-      clonedState[key] = propValue.clone();
-    } else if (Array.isArray(propValue)) {
+    if (Array.isArray(propValue)) {
       const newArray = [];
       for (const child of propValue) {
         if (child instanceof SceneObjectBase) {
           newArray.push(child.clone());
-        } else if (typeof child === "object") {
-          newArray.push(lodash.cloneDeep(child));
         } else {
           newArray.push(child);
         }
       }
       clonedState[key] = newArray;
-    } else if (typeof propValue === "object") {
-      clonedState[key] = lodash.cloneDeep(propValue);
-    } else {
-      clonedState[key] = propValue;
     }
   }
   return clonedState;
@@ -811,21 +806,21 @@ function calculateNetworkTime(requests) {
   return totalNetworkTime;
 }
 
-var __defProp$M = Object.defineProperty;
+var __defProp$N = Object.defineProperty;
 var __defProps$w = Object.defineProperties;
 var __getOwnPropDescs$w = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$M = Object.getOwnPropertySymbols;
-var __hasOwnProp$M = Object.prototype.hasOwnProperty;
-var __propIsEnum$M = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$M = (obj, key, value) => key in obj ? __defProp$M(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$M = (a, b) => {
+var __getOwnPropSymbols$N = Object.getOwnPropertySymbols;
+var __hasOwnProp$N = Object.prototype.hasOwnProperty;
+var __propIsEnum$N = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$N = (obj, key, value) => key in obj ? __defProp$N(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$N = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$M.call(b, prop))
-      __defNormalProp$M(a, prop, b[prop]);
-  if (__getOwnPropSymbols$M)
-    for (var prop of __getOwnPropSymbols$M(b)) {
-      if (__propIsEnum$M.call(b, prop))
-        __defNormalProp$M(a, prop, b[prop]);
+    if (__hasOwnProp$N.call(b, prop))
+      __defNormalProp$N(a, prop, b[prop]);
+  if (__getOwnPropSymbols$N)
+    for (var prop of __getOwnPropSymbols$N(b)) {
+      if (__propIsEnum$N.call(b, prop))
+        __defNormalProp$N(a, prop, b[prop]);
     }
   return a;
 };
@@ -854,7 +849,7 @@ function isQueryController(s) {
 }
 class SceneQueryController extends SceneObjectBase {
   constructor(state = {}) {
-    super(__spreadProps$w(__spreadValues$M({}, state), { isRunning: false }));
+    super(__spreadProps$w(__spreadValues$N({}, state), { isRunning: false }));
     this.isQueryController = true;
     this.profiler = new SceneRenderProfiler(this);
     __privateAdd$2(this, _running, /* @__PURE__ */ new Set());
@@ -866,11 +861,11 @@ class SceneQueryController extends SceneObjectBase {
       return () => __privateGet$2(this, _running).clear();
     });
   }
-  startProfile(name) {
+  startProfile(source) {
     if (!this.state.enableProfiling) {
       return;
     }
-    this.profiler.startProfile(name);
+    this.profiler.startProfile(source.constructor.name);
   }
   queryStarted(entry) {
     __privateGet$2(this, _running).add(entry);
@@ -935,25 +930,25 @@ function getQueryController(sceneObject) {
   return void 0;
 }
 
-var __defProp$L = Object.defineProperty;
-var __getOwnPropSymbols$L = Object.getOwnPropertySymbols;
-var __hasOwnProp$L = Object.prototype.hasOwnProperty;
-var __propIsEnum$L = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$L = (obj, key, value) => key in obj ? __defProp$L(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$L = (a, b) => {
+var __defProp$M = Object.defineProperty;
+var __getOwnPropSymbols$M = Object.getOwnPropertySymbols;
+var __hasOwnProp$M = Object.prototype.hasOwnProperty;
+var __propIsEnum$M = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$M = (obj, key, value) => key in obj ? __defProp$M(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$M = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$L.call(b, prop))
-      __defNormalProp$L(a, prop, b[prop]);
-  if (__getOwnPropSymbols$L)
-    for (var prop of __getOwnPropSymbols$L(b)) {
-      if (__propIsEnum$L.call(b, prop))
-        __defNormalProp$L(a, prop, b[prop]);
+    if (__hasOwnProp$M.call(b, prop))
+      __defNormalProp$M(a, prop, b[prop]);
+  if (__getOwnPropSymbols$M)
+    for (var prop of __getOwnPropSymbols$M(b)) {
+      if (__propIsEnum$M.call(b, prop))
+        __defNormalProp$M(a, prop, b[prop]);
     }
   return a;
 };
 class SceneDataNode extends SceneObjectBase {
   constructor(state) {
-    super(__spreadValues$L({
+    super(__spreadValues$M({
       data: emptyPanelData
     }, state));
   }
@@ -989,14 +984,14 @@ class SceneObjectUrlSyncConfig {
   updateFromUrl(values) {
     this._sceneObject.updateFromUrl(values);
   }
-  shouldCreateHistoryStep(values) {
-    return this._nextChangeShouldAddHistoryStep;
-  }
   performBrowserHistoryAction(callback) {
     this._nextChangeShouldAddHistoryStep = true;
     callback();
     this._nextChangeShouldAddHistoryStep = false;
   }
+  shouldCreateHistoryStep(values) {
+    return this._nextChangeShouldAddHistoryStep;
+  }
 }
 
 const INTERVAL_STRING_REGEX = /^\d+[yYmMsSwWhHdD]$/;
@@ -1087,19 +1082,19 @@ function isValid$1(value, roundUp, timeZone) {
   return parsed.isValid();
 }
 
-var __defProp$K = Object.defineProperty;
-var __getOwnPropSymbols$K = Object.getOwnPropertySymbols;
-var __hasOwnProp$K = Object.prototype.hasOwnProperty;
-var __propIsEnum$K = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$K = (obj, key, value) => key in obj ? __defProp$K(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$K = (a, b) => {
+var __defProp$L = Object.defineProperty;
+var __getOwnPropSymbols$L = Object.getOwnPropertySymbols;
+var __hasOwnProp$L = Object.prototype.hasOwnProperty;
+var __propIsEnum$L = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$L = (obj, key, value) => key in obj ? __defProp$L(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$L = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$K.call(b, prop))
-      __defNormalProp$K(a, prop, b[prop]);
-  if (__getOwnPropSymbols$K)
-    for (var prop of __getOwnPropSymbols$K(b)) {
-      if (__propIsEnum$K.call(b, prop))
-        __defNormalProp$K(a, prop, b[prop]);
+    if (__hasOwnProp$L.call(b, prop))
+      __defNormalProp$L(a, prop, b[prop]);
+  if (__getOwnPropSymbols$L)
+    for (var prop of __getOwnPropSymbols$L(b)) {
+      if (__propIsEnum$L.call(b, prop))
+        __defNormalProp$L(a, prop, b[prop]);
     }
   return a;
 };
@@ -1118,7 +1113,7 @@ class SceneTimeRange extends SceneObjectBase {
       state.weekStart
     );
     const refreshOnActivate = (_a = state.refreshOnActivate) != null ? _a : { percent: 10 };
-    super(__spreadValues$K({ from, to, timeZone, value, refreshOnActivate }, state));
+    super(__spreadValues$L({ from, to, timeZone, value, refreshOnActivate }, state));
     this._urlSync = new SceneObjectUrlSyncConfig(this, { keys: ["from", "to", "timezone", "time", "time.window"] });
     this.onTimeRangeChange = (timeRange) => {
       const update = {};
@@ -1142,7 +1137,7 @@ class SceneTimeRange extends SceneObjectBase {
       );
       if (update.from !== this.state.from || update.to !== this.state.to) {
         const queryController = getQueryController(this);
-        queryController == null ? void 0 : queryController.startProfile("SceneTimeRange");
+        queryController == null ? void 0 : queryController.startProfile(this);
         this._urlSync.performBrowserHistoryAction(() => {
           this.setState(update);
         });
@@ -1901,8 +1896,7 @@ class MultiValueVariable extends SceneObjectBase {
       return { value: "", text: "" };
     }
   }
-  changeValueTo(value, text, isUserAction = false) {
-    var _a, _b;
+  changeValueTo(value, text) {
     if (value === this.state.value && text === this.state.text) {
       return;
     }
@@ -1932,12 +1926,7 @@ class MultiValueVariable extends SceneObjectBase {
     if (lodash.isEqual(value, this.state.value) && lodash.isEqual(text, this.state.text)) {
       return;
     }
-    const stateChangeAction = () => this.setStateHelper({ value, text, loading: false });
-    if (isUserAction) {
-      (_b = (_a = this._urlSync).performBrowserHistoryAction) == null ? void 0 : _b.call(_a, stateChangeAction);
-    } else {
-      stateChangeAction();
-    }
+    this.setStateHelper({ value, text, loading: false });
     this.publishEvent(new SceneVariableValueChangedEvent(this), true);
   }
   findLabelTextForValue(value) {
@@ -1991,7 +1980,6 @@ function findOptionMatchingCurrent(currentValue, currentText, options) {
 class MultiValueUrlSyncHandler {
   constructor(_sceneObject) {
     this._sceneObject = _sceneObject;
-    this._nextChangeShouldAddHistoryStep = false;
   }
   getKey() {
     return `var-${this._sceneObject.state.name}`;
@@ -2032,14 +2020,6 @@ class MultiValueUrlSyncHandler {
       this._sceneObject.changeValueTo(urlValue);
     }
   }
-  performBrowserHistoryAction(callback) {
-    this._nextChangeShouldAddHistoryStep = true;
-    callback();
-    this._nextChangeShouldAddHistoryStep = false;
-  }
-  shouldCreateHistoryStep(values) {
-    return this._nextChangeShouldAddHistoryStep;
-  }
 }
 function handleLegacyUrlAllValue(value) {
   if (lodash.isArray(value) && value[0] === ALL_VARIABLE_TEXT) {
@@ -2116,21 +2096,21 @@ function collectAllVariables(sceneObject, record = {}) {
   return record;
 }
 
-var __defProp$J = Object.defineProperty;
+var __defProp$K = Object.defineProperty;
 var __defProps$v = Object.defineProperties;
 var __getOwnPropDescs$v = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$J = Object.getOwnPropertySymbols;
-var __hasOwnProp$J = Object.prototype.hasOwnProperty;
-var __propIsEnum$J = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$J = (obj, key, value) => key in obj ? __defProp$J(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$J = (a, b) => {
+var __getOwnPropSymbols$K = Object.getOwnPropertySymbols;
+var __hasOwnProp$K = Object.prototype.hasOwnProperty;
+var __propIsEnum$K = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$K = (obj, key, value) => key in obj ? __defProp$K(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$K = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$J.call(b, prop))
-      __defNormalProp$J(a, prop, b[prop]);
-  if (__getOwnPropSymbols$J)
-    for (var prop of __getOwnPropSymbols$J(b)) {
-      if (__propIsEnum$J.call(b, prop))
-        __defNormalProp$J(a, prop, b[prop]);
+    if (__hasOwnProp$K.call(b, prop))
+      __defNormalProp$K(a, prop, b[prop]);
+  if (__getOwnPropSymbols$K)
+    for (var prop of __getOwnPropSymbols$K(b)) {
+      if (__propIsEnum$K.call(b, prop))
+        __defNormalProp$K(a, prop, b[prop]);
     }
   return a;
 };
@@ -2150,7 +2130,7 @@ function getTemplateProxyForField(field, frame, frames) {
           if (!field.labels) {
             return "";
           }
-          return __spreadProps$v(__spreadValues$J({}, field.labels), {
+          return __spreadProps$v(__spreadValues$K({}, field.labels), {
             __values: Object.values(field.labels).sort().join(", "),
             toString: () => {
               return data.formatLabels(field.labels, "", true);
@@ -2646,21 +2626,21 @@ function isExtraQueryProvider(obj) {
   return typeof obj === "object" && "getExtraQueries" in obj;
 }
 
-var __defProp$I = Object.defineProperty;
+var __defProp$J = Object.defineProperty;
 var __defProps$u = Object.defineProperties;
 var __getOwnPropDescs$u = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$I = Object.getOwnPropertySymbols;
-var __hasOwnProp$I = Object.prototype.hasOwnProperty;
-var __propIsEnum$I = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$I = (obj, key, value) => key in obj ? __defProp$I(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$I = (a, b) => {
+var __getOwnPropSymbols$J = Object.getOwnPropertySymbols;
+var __hasOwnProp$J = Object.prototype.hasOwnProperty;
+var __propIsEnum$J = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$J = (obj, key, value) => key in obj ? __defProp$J(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$J = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$I.call(b, prop))
-      __defNormalProp$I(a, prop, b[prop]);
-  if (__getOwnPropSymbols$I)
-    for (var prop of __getOwnPropSymbols$I(b)) {
-      if (__propIsEnum$I.call(b, prop))
-        __defNormalProp$I(a, prop, b[prop]);
+    if (__hasOwnProp$J.call(b, prop))
+      __defNormalProp$J(a, prop, b[prop]);
+  if (__getOwnPropSymbols$J)
+    for (var prop of __getOwnPropSymbols$J(b)) {
+      if (__propIsEnum$J.call(b, prop))
+        __defNormalProp$J(a, prop, b[prop]);
     }
   return a;
 };
@@ -2677,7 +2657,7 @@ const extraQueryProcessingOperator = (processors) => (data) => {
     }),
     rxjs.map(([primary, ...processedSecondaries]) => {
       var _a;
-      return __spreadProps$u(__spreadValues$I({}, primary), {
+      return __spreadProps$u(__spreadValues$J({}, primary), {
         series: [...primary.series, ...processedSecondaries.flatMap((s) => s.series)],
         annotations: [...(_a = primary.annotations) != null ? _a : [], ...processedSecondaries.flatMap((s) => {
           var _a2;
@@ -2688,21 +2668,21 @@ const extraQueryProcessingOperator = (processors) => (data) => {
   );
 };
 
-var __defProp$H = Object.defineProperty;
+var __defProp$I = Object.defineProperty;
 var __defProps$t = Object.defineProperties;
 var __getOwnPropDescs$t = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$H = Object.getOwnPropertySymbols;
-var __hasOwnProp$H = Object.prototype.hasOwnProperty;
-var __propIsEnum$H = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$H = (obj, key, value) => key in obj ? __defProp$H(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$H = (a, b) => {
+var __getOwnPropSymbols$I = Object.getOwnPropertySymbols;
+var __hasOwnProp$I = Object.prototype.hasOwnProperty;
+var __propIsEnum$I = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$I = (obj, key, value) => key in obj ? __defProp$I(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$I = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$H.call(b, prop))
-      __defNormalProp$H(a, prop, b[prop]);
-  if (__getOwnPropSymbols$H)
-    for (var prop of __getOwnPropSymbols$H(b)) {
-      if (__propIsEnum$H.call(b, prop))
-        __defNormalProp$H(a, prop, b[prop]);
+    if (__hasOwnProp$I.call(b, prop))
+      __defNormalProp$I(a, prop, b[prop]);
+  if (__getOwnPropSymbols$I)
+    for (var prop of __getOwnPropSymbols$I(b)) {
+      if (__propIsEnum$I.call(b, prop))
+        __defNormalProp$I(a, prop, b[prop]);
     }
   return a;
 };
@@ -2758,11 +2738,11 @@ function filterAnnotations(data, filters) {
           continue;
         }
       }
-      fields.push(__spreadProps$t(__spreadValues$H({}, field), {
+      fields.push(__spreadProps$t(__spreadValues$I({}, field), {
         values: buffer
       }));
     }
-    processed.push(__spreadProps$t(__spreadValues$H({}, frame), {
+    processed.push(__spreadProps$t(__spreadValues$I({}, frame), {
       fields,
       length: frameLength
     }));
@@ -2843,21 +2823,21 @@ function getOptionSearcher(options, includeAll = false) {
   return (search) => fuzzySearch(search).map((i) => allOptions[i]);
 }
 
-var __defProp$G = Object.defineProperty;
+var __defProp$H = Object.defineProperty;
 var __defProps$s = Object.defineProperties;
 var __getOwnPropDescs$s = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$G = Object.getOwnPropertySymbols;
-var __hasOwnProp$G = Object.prototype.hasOwnProperty;
-var __propIsEnum$G = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$G = (obj, key, value) => key in obj ? __defProp$G(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$G = (a, b) => {
+var __getOwnPropSymbols$H = Object.getOwnPropertySymbols;
+var __hasOwnProp$H = Object.prototype.hasOwnProperty;
+var __propIsEnum$H = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$H = (obj, key, value) => key in obj ? __defProp$H(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$H = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$G.call(b, prop))
-      __defNormalProp$G(a, prop, b[prop]);
-  if (__getOwnPropSymbols$G)
-    for (var prop of __getOwnPropSymbols$G(b)) {
-      if (__propIsEnum$G.call(b, prop))
-        __defNormalProp$G(a, prop, b[prop]);
+    if (__hasOwnProp$H.call(b, prop))
+      __defNormalProp$H(a, prop, b[prop]);
+  if (__getOwnPropSymbols$H)
+    for (var prop of __getOwnPropSymbols$H(b)) {
+      if (__propIsEnum$H.call(b, prop))
+        __defNormalProp$H(a, prop, b[prop]);
     }
   return a;
 };
@@ -2865,11 +2845,11 @@ var __spreadProps$s = (a, b) => __defProps$s(a, __getOwnPropDescs$s(b));
 var __objRest$4 = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp$G.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp$H.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols$G)
-    for (var prop of __getOwnPropSymbols$G(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum$G.call(source, prop))
+  if (source != null && __getOwnPropSymbols$H)
+    for (var prop of __getOwnPropSymbols$H(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum$H.call(source, prop))
         target[prop] = source[prop];
     }
   return target;
@@ -2935,8 +2915,8 @@ function VariableValueSelect({ model }) {
     options: filteredOptions,
     "data-testid": e2eSelectors.selectors.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts(`${value}`),
     onChange: (newValue) => {
-      model.changeValueTo(newValue.value, newValue.label, true);
-      queryController == null ? void 0 : queryController.startProfile("VariableValueSelect");
+      model.changeValueTo(newValue.value, newValue.label);
+      queryController == null ? void 0 : queryController.startProfile(model);
       if (hasCustomValue !== newValue.__isNew__) {
         setHasCustomValue(newValue.__isNew__);
       }
@@ -3002,14 +2982,14 @@ function VariableValueSelectMulti({ model }) {
     hideSelectedOptions: false,
     onInputChange,
     onBlur: () => {
-      model.changeValueTo(uncommittedValue, void 0, true);
-      queryController == null ? void 0 : queryController.startProfile("VariableValueSelectMulti");
+      model.changeValueTo(uncommittedValue);
+      queryController == null ? void 0 : queryController.startProfile(model);
     },
     filterOption: filterNoOp$2,
     "data-testid": e2eSelectors.selectors.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts(`${uncommittedValue}`),
     onChange: (newValue, action) => {
       if (action.action === "clear" && noValueOnClear) {
-        model.changeValueTo([], void 0, true);
+        model.changeValueTo([]);
       }
       setUncommittedValue(newValue.map((x) => x.value));
     }
@@ -3030,7 +3010,7 @@ const OptionWithCheckbox = ({
   const theme = ui.useTheme2();
   const selectStyles = ui.getSelectStyles(theme);
   const optionStyles = ui.useStyles2(getOptionStyles);
-  return /* @__PURE__ */ React__default["default"].createElement("div", __spreadProps$s(__spreadValues$G({
+  return /* @__PURE__ */ React__default["default"].createElement("div", __spreadProps$s(__spreadValues$H({
     ref: innerRef,
     className: css.cx(selectStyles.option, isFocused && selectStyles.optionFocused)
   }, rest), {
@@ -3195,28 +3175,28 @@ function wrapInSafeSerializableSceneObject(sceneObject) {
   return { value: sceneObject, text: "__sceneObject" };
 }
 
-var __defProp$F = Object.defineProperty;
+var __defProp$G = Object.defineProperty;
 var __defProps$r = Object.defineProperties;
 var __getOwnPropDescs$r = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$F = Object.getOwnPropertySymbols;
-var __hasOwnProp$F = Object.prototype.hasOwnProperty;
-var __propIsEnum$F = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$F = (obj, key, value) => key in obj ? __defProp$F(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$F = (a, b) => {
+var __getOwnPropSymbols$G = Object.getOwnPropertySymbols;
+var __hasOwnProp$G = Object.prototype.hasOwnProperty;
+var __propIsEnum$G = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$G = (obj, key, value) => key in obj ? __defProp$G(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$G = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$F.call(b, prop))
-      __defNormalProp$F(a, prop, b[prop]);
-  if (__getOwnPropSymbols$F)
-    for (var prop of __getOwnPropSymbols$F(b)) {
-      if (__propIsEnum$F.call(b, prop))
-        __defNormalProp$F(a, prop, b[prop]);
+    if (__hasOwnProp$G.call(b, prop))
+      __defNormalProp$G(a, prop, b[prop]);
+  if (__getOwnPropSymbols$G)
+    for (var prop of __getOwnPropSymbols$G(b)) {
+      if (__propIsEnum$G.call(b, prop))
+        __defNormalProp$G(a, prop, b[prop]);
     }
   return a;
 };
 var __spreadProps$r = (a, b) => __defProps$r(a, __getOwnPropDescs$r(b));
 class GroupByVariable extends MultiValueVariable {
   constructor(initialState) {
-    super(__spreadProps$r(__spreadValues$F({
+    super(__spreadProps$r(__spreadValues$G({
       isMulti: true,
       name: "",
       value: [],
@@ -3247,7 +3227,7 @@ class GroupByVariable extends MultiValueVariable {
       const queries = getQueriesForVariables(this);
       const otherFilters = this.state.baseFilters || [];
       const timeRange = sceneGraph.getTimeRange(this).state.value;
-      const response = await ds.getTagKeys(__spreadValues$F({
+      const response = await ds.getTagKeys(__spreadValues$G({
         filters: otherFilters,
         queries,
         timeRange
@@ -3408,13 +3388,12 @@ function GroupByVariableRenderer({ model }) {
     onBlur: () => {
       model.changeValueTo(
         uncommittedValue.map((x) => x.value),
-        uncommittedValue.map((x) => x.label),
-        true
+        uncommittedValue.map((x) => x.label)
       );
     },
     onChange: (newValue, action) => {
       if (action.action === "clear" && noValueOnClear) {
-        model.changeValueTo([], void 0, true);
+        model.changeValueTo([]);
       }
       setUncommittedValue(newValue);
     },
@@ -3608,19 +3587,19 @@ function getAdhocOptionSearcher(options) {
   return (search) => fuzzySearch(search).map((i) => options[i]);
 }
 
-var __defProp$E = Object.defineProperty;
-var __getOwnPropSymbols$E = Object.getOwnPropertySymbols;
-var __hasOwnProp$E = Object.prototype.hasOwnProperty;
-var __propIsEnum$E = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$E = (obj, key, value) => key in obj ? __defProp$E(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$E = (a, b) => {
+var __defProp$F = Object.defineProperty;
+var __getOwnPropSymbols$F = Object.getOwnPropertySymbols;
+var __hasOwnProp$F = Object.prototype.hasOwnProperty;
+var __propIsEnum$F = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$F = (obj, key, value) => key in obj ? __defProp$F(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$F = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$E.call(b, prop))
-      __defNormalProp$E(a, prop, b[prop]);
-  if (__getOwnPropSymbols$E)
-    for (var prop of __getOwnPropSymbols$E(b)) {
-      if (__propIsEnum$E.call(b, prop))
-        __defNormalProp$E(a, prop, b[prop]);
+    if (__hasOwnProp$F.call(b, prop))
+      __defNormalProp$F(a, prop, b[prop]);
+  if (__getOwnPropSymbols$F)
+    for (var prop of __getOwnPropSymbols$F(b)) {
+      if (__propIsEnum$F.call(b, prop))
+        __defNormalProp$F(a, prop, b[prop]);
     }
   return a;
 };
@@ -3709,7 +3688,7 @@ function AdHocFilterRenderer({ filter, model }) {
       });
     }
   };
-  const valueSelect = /* @__PURE__ */ React__default["default"].createElement(ui.Select, __spreadValues$E({
+  const valueSelect = /* @__PURE__ */ React__default["default"].createElement(ui.Select, __spreadValues$F({
     virtualized: true,
     allowCustomValue: (_b = model.state.allowCustomValue) != null ? _b : true,
     isValidNewOption: (inputValue) => inputValue.trim().length > 0,
@@ -3923,37 +3902,78 @@ function AdHocFilterBuilder({ model, addFilterButtonText }) {
   });
 }
 
+var __defProp$E = Object.defineProperty;
+var __getOwnPropSymbols$E = Object.getOwnPropertySymbols;
+var __hasOwnProp$E = Object.prototype.hasOwnProperty;
+var __propIsEnum$E = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$E = (obj, key, value) => key in obj ? __defProp$E(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$E = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$E.call(b, prop))
+      __defNormalProp$E(a, prop, b[prop]);
+  if (__getOwnPropSymbols$E)
+    for (var prop of __getOwnPropSymbols$E(b)) {
+      if (__propIsEnum$E.call(b, prop))
+        __defNormalProp$E(a, prop, b[prop]);
+    }
+  return a;
+};
 class AdHocFiltersVariableUrlSyncHandler {
   constructor(_variable) {
     this._variable = _variable;
   }
-  getKey() {
+  getKey(isInjected) {
+    if (isInjected) {
+      return `var-injected-${this._variable.state.name}`;
+    }
     return `var-${this._variable.state.name}`;
   }
   getKeys() {
-    return [this.getKey()];
+    return [this.getKey(), this.getKey(true)];
   }
   getUrlState() {
     const filters = this._variable.state.filters;
-    if (filters.length === 0) {
-      return { [this.getKey()]: [""] };
+    const baseFilters = this._variable.state.baseFilters;
+    let value = [""];
+    let baseValues = [""];
+    if (filters.length === 0 && (baseFilters == null ? void 0 : baseFilters.length) === 0) {
+      return { [this.getKey()]: value };
+    }
+    if (filters.length) {
+      value = filters.filter(isFilterComplete).filter((filter) => !filter.hidden).map((filter) => toArray(filter).map(escapeUrlPipeDelimiters).join("|"));
+    }
+    if (baseFilters == null ? void 0 : baseFilters.length) {
+      baseValues = baseFilters == null ? void 0 : baseFilters.filter(isFilterComplete).filter((filter) => !filter.hidden && filter.source).map(
+        (filter) => {
+          var _a, _b;
+          return toArray(filter).map(escapeUrlPipeDelimiters).join("|").concat(`/${(_b = (_a = filter.originalValue) == null ? void 0 : _a.map(escapeUrlPipeDelimiters).join("|")) != null ? _b : ""}/${filter.source}`);
+        }
+      );
     }
-    const value = filters.filter(isFilterComplete).filter((filter) => !filter.hidden).map((filter) => toArray(filter).map(escapeUrlPipeDelimiters).join("|"));
-    return { [this.getKey()]: value };
+    return __spreadValues$E({
+      [this.getKey()]: value
+    }, (baseFilters == null ? void 0 : baseFilters.length) ? { [this.getKey(true)]: baseValues } : {});
   }
   updateFromUrl(values) {
     const urlValue = values[this.getKey()];
-    if (urlValue == null) {
+    const urlValueBaseFilters = values[this.getKey(true)];
+    if (urlValue == null && urlValueBaseFilters == null) {
       return;
     }
-    const filters = deserializeUrlToFilters(urlValue);
-    this._variable.setState({ filters });
+    if (urlValue) {
+      const filters = deserializeUrlToFilters(urlValue);
+      this._variable.setState({ filters });
+    }
+    if (urlValueBaseFilters) {
+      const baseFilters = deserializeUrlToFilters(urlValueBaseFilters);
+      this._variable.setState({ baseFilters });
+    }
   }
 }
 function deserializeUrlToFilters(value) {
   if (Array.isArray(value)) {
     const values = value;
-    return values.map(toFilter).filter(isFilter);
+    return values.map((value2) => toFilter(value2)).filter(isFilter);
   }
   const filter = toFilter(value);
   return filter === null ? [] : [filter];
@@ -3972,10 +3992,12 @@ function toArray(filter) {
   return result;
 }
 function toFilter(urlValue) {
+  var _a;
   if (typeof urlValue !== "string" || urlValue.length === 0) {
     return null;
   }
-  const [key, keyLabel, operator, _operatorLabel, ...values] = urlValue.split("|").reduce((acc, v) => {
+  const [filter, originalValues, source] = urlValue.split("/");
+  const [key, keyLabel, operator, _operatorLabel, ...values] = filter.split("|").reduce((acc, v) => {
     const [key2, label] = v.split(",");
     acc.push(key2, label != null ? label : key2);
     return acc;
@@ -3987,7 +4009,9 @@ function toFilter(urlValue) {
     value: values[0],
     values: isMultiValueOperator(operator) ? values.filter((_, index) => index % 2 === 0) : void 0,
     valueLabels: values.filter((_, index) => index % 2 === 1),
-    condition: ""
+    condition: "",
+    source,
+    originalValue: originalValues && originalValues.length ? (_a = originalValues.split("|")) != null ? _a : [originalValues] : void 0
   };
 }
 function isFilter(filter) {
@@ -5109,6 +5133,7 @@ var __spreadValues$A = (a, b) => {
   return a;
 };
 var __spreadProps$o = (a, b) => __defProps$o(a, __getOwnPropDescs$o(b));
+const LABEL_MAX_VISIBLE_LENGTH = 20;
 function AdHocFilterPill({ filter, model, readOnly, focusOnWipInputRef }) {
   var _a, _b, _c;
   const styles = ui.useStyles2(getStyles$b);
@@ -5152,7 +5177,7 @@ function AdHocFilterPill({ filter, model, readOnly, focusOnWipInputRef }) {
       className: styles.pillText
     }, keyLabel, " ", filter.operator, " ", valueLabel);
     return /* @__PURE__ */ React__default["default"].createElement("div", {
-      className: css.cx(styles.combinedFilterPill, { [styles.readOnlyCombinedFilter]: readOnly }),
+      className: css.cx(styles.combinedFilterPill, readOnly && styles.readOnlyCombinedFilter),
       onClick: (e) => {
         e.stopPropagation();
         setPopulateInputOnEdit(true);
@@ -5168,12 +5193,12 @@ function AdHocFilterPill({ filter, model, readOnly, focusOnWipInputRef }) {
       "aria-label": `Edit filter with key ${keyLabel}`,
       tabIndex: 0,
       ref: pillWrapperRef
-    }, valueLabel.length < 20 ? pillText : /* @__PURE__ */ React__default["default"].createElement(ui.Tooltip, {
+    }, valueLabel.length < LABEL_MAX_VISIBLE_LENGTH ? pillText : /* @__PURE__ */ React__default["default"].createElement(ui.Tooltip, {
       content: /* @__PURE__ */ React__default["default"].createElement("div", {
         className: styles.tooltipText
       }, valueLabel),
       placement: "top"
-    }, pillText), !readOnly ? /* @__PURE__ */ React__default["default"].createElement(ui.IconButton, {
+    }, pillText), !readOnly && !filter.source ? /* @__PURE__ */ React__default["default"].createElement(ui.IconButton, {
       onClick: (e) => {
         e.stopPropagation();
         model._removeFilter(filter);
@@ -5189,9 +5214,23 @@ function AdHocFilterPill({ filter, model, readOnly, focusOnWipInputRef }) {
       },
       name: "times",
       size: "md",
-      className: styles.removeButton,
+      className: styles.pillIcon,
       tooltip: `Remove filter with key ${keyLabel}`
-    }) : null);
+    }) : null, filter.source && !filter.originalValue && /* @__PURE__ */ React__default["default"].createElement(ui.IconButton, {
+      name: "info-circle",
+      size: "md",
+      className: styles.pillIcon,
+      tooltip: `This is a ${filter.source} injected filter`
+    }), filter.source && filter.originalValue && /* @__PURE__ */ React__default["default"].createElement(ui.IconButton, {
+      onClick: (e) => {
+        e.stopPropagation();
+        model.restoreBaseFilter(filter);
+      },
+      name: "history",
+      size: "md",
+      className: styles.pillIcon,
+      tooltip: `Restore filter to its original value`
+    }));
   }
   return /* @__PURE__ */ React__default["default"].createElement(AdHocCombobox, {
     filter,
@@ -5227,7 +5266,7 @@ const getStyles$b = (theme) => ({
       background: theme.colors.action.selected
     }
   }),
-  removeButton: css.css({
+  pillIcon: css.css({
     marginInline: theme.spacing(0.5),
     cursor: "pointer",
     "&:hover": {
@@ -5261,7 +5300,7 @@ const AdHocFiltersAlwaysWipCombobox = React.forwardRef(function AdHocFiltersAlwa
 });
 
 const AdHocFiltersComboboxRenderer = React.memo(function AdHocFiltersComboboxRenderer2({ model }) {
-  const { filters, readOnly } = model.useState();
+  const { baseFilters, filters, readOnly } = model.useState();
   const styles = ui.useStyles2(getStyles$a);
   const focusOnWipInputRef = React.useRef();
   return /* @__PURE__ */ React__default["default"].createElement("div", {
@@ -5274,7 +5313,14 @@ const AdHocFiltersComboboxRenderer = React.memo(function AdHocFiltersComboboxRen
     name: "filter",
     className: styles.filterIcon,
     size: "lg"
-  }), filters.map((filter, index) => /* @__PURE__ */ React__default["default"].createElement(AdHocFilterPill, {
+  }), baseFilters == null ? void 0 : baseFilters.map(
+    (filter, index) => filter.source ? /* @__PURE__ */ React__default["default"].createElement(AdHocFilterPill, {
+      key: `${index}-${filter.key}`,
+      filter,
+      model,
+      focusOnWipInputRef: focusOnWipInputRef.current
+    }) : null
+  ), filters.map((filter, index) => /* @__PURE__ */ React__default["default"].createElement(AdHocFilterPill, {
     key: `${index}-${filter.key}`,
     filter,
     model,
@@ -5336,6 +5382,11 @@ var __spreadValues$z = (a, b) => {
   return a;
 };
 var __spreadProps$n = (a, b) => __defProps$n(a, __getOwnPropDescs$n(b));
+var FilterSource = /* @__PURE__ */ ((FilterSource2) => {
+  FilterSource2["Scopes"] = "scopes";
+  FilterSource2["Dashboards"] = "dashboards";
+  return FilterSource2;
+})(FilterSource || {});
 const OPERATORS = [
   {
     value: "=",
@@ -5393,9 +5444,13 @@ class AdHocFiltersVariable extends SceneObjectBase {
     }
   }
   setState(update) {
+    var _a, _b, _c;
     let filterExpressionChanged = false;
-    if (update.filters && update.filters !== this.state.filters && !update.filterExpression) {
-      update.filterExpression = renderExpression(this.state.expressionBuilder, update.filters);
+    if ((update.filters && update.filters !== this.state.filters || update.baseFilters && update.baseFilters !== this.state.baseFilters) && !update.filterExpression) {
+      update.filterExpression = renderExpression(this.state.expressionBuilder, [
+        ...(_b = (_a = update.baseFilters) == null ? void 0 : _a.filter((filter) => filter.source)) != null ? _b : [],
+        ...(_c = update.filters) != null ? _c : []
+      ]);
       filterExpressionChanged = update.filterExpression !== this.state.filterExpression;
     }
     super.setState(update);
@@ -5418,11 +5473,36 @@ class AdHocFiltersVariable extends SceneObjectBase {
       this.publishEvent(new SceneVariableValueChangedEvent(this), true);
     }
   }
+  restoreBaseFilter(filter) {
+    if (filter) {
+      const originalBaseFilter = filter.originalValue;
+      if (originalBaseFilter == null ? void 0 : originalBaseFilter.length) {
+        this._updateFilter(filter, {
+          value: originalBaseFilter[0],
+          values: originalBaseFilter,
+          valueLabels: originalBaseFilter,
+          originalValue: void 0
+        });
+      }
+    }
+  }
   getValue() {
     return this.state.filterExpression;
   }
   _updateFilter(filter, update) {
-    const { filters, _wip } = this.state;
+    var _a;
+    const { baseFilters, filters, _wip } = this.state;
+    const isBaseFilter = baseFilters == null ? void 0 : baseFilters.includes(filter);
+    if (isBaseFilter && filter.source) {
+      if (!filter.originalValue) {
+        update.originalValue = filter.values ? filter.values : [filter.value];
+      }
+      const updatedBaseFilters = (_a = baseFilters == null ? void 0 : baseFilters.map((f) => {
+        return f === filter ? __spreadValues$z(__spreadValues$z({}, f), update) : f;
+      })) != null ? _a : [];
+      this.setState({ baseFilters: updatedBaseFilters });
+      return;
+    }
     if (filter === _wip) {
       if ("value" in update && update["value"] !== "") {
         this.setState({ filters: [...filters, __spreadValues$z(__spreadValues$z({}, _wip), update)], _wip: void 0 });
@@ -5508,7 +5588,7 @@ class AdHocFiltersVariable extends SceneObjectBase {
     return keys.map(toSelectableValue);
   }
   async _getValuesFor(filter) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const override = await ((_b = (_a = this.state).getTagValuesProvider) == null ? void 0 : _b.call(_a, this, filter));
     if (override && override.replace) {
       return dataFromResponse(override.values).map(toSelectableValue);
@@ -5517,7 +5597,8 @@ class AdHocFiltersVariable extends SceneObjectBase {
     if (!ds || !ds.getTagValues) {
       return [];
     }
-    const otherFilters = this.state.filters.filter((f) => f.key !== filter.key).concat((_c = this.state.baseFilters) != null ? _c : []);
+    const filteredBaseFilters = (_d = (_c = this.state.baseFilters) == null ? void 0 : _c.filter((f) => f.source && f.key !== filter.key)) != null ? _d : [];
+    const otherFilters = this.state.filters.filter((f) => f.key !== filter.key).concat(filteredBaseFilters);
     const timeRange = sceneGraph.getTimeRange(this).state.value;
     const queries = this.state.useQueriesAsFilterForOptions ? getQueriesForVariables(this) : void 0;
     const response = await ds.getTagValues(__spreadValues$z({
@@ -5968,7 +6049,7 @@ class SceneQueryRunner extends SceneObjectBase {
     return clone;
   }
   prepareRequests(timeRange, ds) {
-    var _a;
+    var _a, _b;
     const { minInterval, queries } = this.state;
     let request = __spreadValues$y({
       app: "scenes",
@@ -5990,7 +6071,12 @@ class SceneQueryRunner extends SceneObjectBase {
       queryCachingTTL: this.state.queryCachingTTL
     }, getEnrichedDataRequest(this));
     if (this._adhocFiltersVar) {
-      request.filters = this._adhocFiltersVar.state.filters.filter(isFilterComplete);
+      request.filters = [];
+      if ((_a = this._adhocFiltersVar.state.baseFilters) == null ? void 0 : _a.length) {
+        const injectedBaseFilters = this._adhocFiltersVar.state.baseFilters.filter((filter) => filter.source);
+        request.filters = request.filters.concat(injectedBaseFilters);
+      }
+      request.filters = request.filters.concat(this._adhocFiltersVar.state.filters.filter(isFilterComplete));
     }
     if (this._groupByVar) {
       request.groupByKeys = this._groupByVar.state.value;
@@ -6013,7 +6099,7 @@ class SceneQueryRunner extends SceneObjectBase {
     const primaryTimeRange = timeRange.state.value;
     let secondaryRequests = [];
     let secondaryProcessors = /* @__PURE__ */ new Map();
-    for (const provider of (_a = this.getClosestExtraQueryProviders()) != null ? _a : []) {
+    for (const provider of (_b = this.getClosestExtraQueryProviders()) != null ? _b : []) {
       for (const { req, processor } of provider.getExtraQueries(request)) {
         const requestId = getNextRequestId$1();
         secondaryRequests.push(__spreadProps$m(__spreadValues$y({}, req), { requestId }));
@@ -10928,10 +11014,6 @@ function getResizeHandleStyles(theme) {
   });
 }
 
-class SceneGridLayoutDragStartEvent extends data.BusEventWithPayload {
-}
-SceneGridLayoutDragStartEvent.type = "scene-grid-layout-drag-start";
-
 var __defProp$9 = Object.defineProperty;
 var __defProps$6 = Object.defineProperties;
 var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
@@ -11064,13 +11146,6 @@ const _SceneGridLayout = class extends SceneObjectBase {
   getDragClassCancel() {
     return `grid-drag-cancel`;
   }
-  getDragHooks() {
-    return {
-      onDragStart: (evt, panel) => {
-        this.publishEvent(new SceneGridLayoutDragStartEvent({ evt, panel }), true);
-      }
-    };
-  }
   toggleRow(row) {
     var _a, _b;
     const isCollapsed = row.state.isCollapsed;
@@ -11732,7 +11807,7 @@ class SceneRefreshPicker extends SceneObjectBase {
     this._autoRefreshBlocked = false;
     this.onRefresh = () => {
       const queryController = sceneGraph.getQueryController(this);
-      queryController == null ? void 0 : queryController.startProfile("SceneRefreshPicker");
+      queryController == null ? void 0 : queryController.startProfile(this);
       if (queryController == null ? void 0 : queryController.state.isRunning) {
         queryController.cancelAll();
         return;
@@ -11789,7 +11864,7 @@ class SceneRefreshPicker extends SceneObjectBase {
       this._intervalTimer = setInterval(() => {
         if (this.isTabVisible()) {
           const queryController = sceneGraph.getQueryController(this);
-          queryController == null ? void 0 : queryController.startProfile("SceneRefreshPicker");
+          queryController == null ? void 0 : queryController.startProfile(this);
           timeRange.onRefresh();
         } else {
           this._autoRefreshBlocked = true;
@@ -14197,9 +14272,9 @@ exports.EmbeddedScene = EmbeddedScene;
 exports.FieldConfigBuilder = FieldConfigBuilder;
 exports.FieldConfigBuilders = FieldConfigBuilders;
 exports.FieldConfigOverridesBuilder = FieldConfigOverridesBuilder;
+exports.FilterSource = FilterSource;
 exports.GroupByVariable = GroupByVariable;
 exports.IntervalVariable = IntervalVariable;
-exports.LazyLoader = LazyLoader;
 exports.LocalValueVariable = LocalValueVariable;
 exports.MultiValueVariable = MultiValueVariable;
 exports.NestedScene = NestedScene;
@@ -14228,7 +14303,6 @@ exports.SceneFlexItem = SceneFlexItem;
 exports.SceneFlexLayout = SceneFlexLayout;
 exports.SceneGridItem = SceneGridItem;
 exports.SceneGridLayout = SceneGridLayout;
-exports.SceneGridLayoutDragStartEvent = SceneGridLayoutDragStartEvent;
 exports.SceneGridRow = SceneGridRow;
 exports.SceneObjectBase = SceneObjectBase;
 exports.SceneObjectRef = SceneObjectRef;