@grafana/scenes 5.16.1--canary.924.11083854672.0 → 5.16.1

package/dist/index.js

@@ -1384,434 +1384,727 @@ class IntervalMacro {
   }
 }
 
-class AllVariablesMacro {
-  constructor(name, sceneObject) {
-    this.state = { name, type: "url_variable" };
-    this._sceneObject = sceneObject;
+function setBaseClassState(sceneObject, newState) {
+  sceneObject.setState(newState);
+}
+function useLocationServiceSafe() {
+  return runtime.useLocationService ? runtime.useLocationService() : runtime.locationService;
+}
+
+class MultiValueVariable extends SceneObjectBase {
+  constructor() {
+    super(...arguments);
+    this._urlSync = new MultiValueUrlSyncHandler(this);
   }
-  getValue() {
-    const allVars = collectAllVariables(this._sceneObject);
-    const format = formatRegistry.get(schema.VariableFormatID.QueryParam);
-    const params = [];
-    for (const name of Object.keys(allVars)) {
-      const variable = allVars[name];
-      const value = variable.getValue();
-      if (!value) {
-        continue;
-      }
-      if (isCustomVariableValue(value)) {
-        params.push(value.formatter(schema.VariableFormatID.QueryParam));
-      } else {
-        params.push(format.formatter(value, [], variable));
-      }
-    }
-    return new SkipFormattingValue(params.join("&"));
+  validateAndUpdate() {
+    return this.getValueOptions({}).pipe(
+      rxjs.map((options) => {
+        this.updateValueGivenNewOptions(options);
+        return {};
+      })
+    );
   }
-  getValueText() {
-    return "";
+  onCancel() {
+    this.setStateHelper({ loading: false });
+    const sceneVarSet = this.parent;
+    sceneVarSet == null ? void 0 : sceneVarSet.cancel(this);
   }
-}
-function collectAllVariables(sceneObject, record = {}) {
-  if (sceneObject.state.$variables) {
-    for (const variable of sceneObject.state.$variables.state.variables) {
-      if (variable.state.skipUrlSync) {
-        continue;
-      }
-      if (!record[variable.state.name]) {
-        record[variable.state.name] = variable;
-      }
+  updateValueGivenNewOptions(options) {
+    const { value: currentValue, text: currentText, options: oldOptions } = this.state;
+    const stateUpdate = this.getStateUpdateGivenNewOptions(options, currentValue, currentText);
+    this.interceptStateUpdateAfterValidation(stateUpdate);
+    this.setStateHelper(stateUpdate);
+    if (stateUpdate.value !== currentValue || stateUpdate.text !== currentText || this.hasAllValue() && !lodash.isEqual(options, oldOptions)) {
+      this.publishEvent(new SceneVariableValueChangedEvent(this), true);
     }
   }
-  if (sceneObject.parent) {
-    collectAllVariables(sceneObject.parent, record);
-  }
-  return record;
-}
-
-var __defProp$H = Object.defineProperty;
-var __defProps$s = Object.defineProperties;
-var __getOwnPropDescs$s = 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) => {
-  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]);
+  getStateUpdateGivenNewOptions(options, currentValue, currentText) {
+    const stateUpdate = {
+      options,
+      loading: false,
+      value: currentValue,
+      text: currentText
+    };
+    if (options.length === 0) {
+      if (this.state.defaultToAll || this.state.includeAll) {
+        stateUpdate.value = ALL_VARIABLE_VALUE;
+        stateUpdate.text = ALL_VARIABLE_TEXT;
+      } else if (this.state.isMulti) {
+        stateUpdate.value = [];
+        stateUpdate.text = [];
+      } else {
+        stateUpdate.value = "";
+        stateUpdate.text = "";
+      }
+      return stateUpdate;
     }
-  return a;
-};
-var __spreadProps$s = (a, b) => __defProps$s(a, __getOwnPropDescs$s(b));
-function getTemplateProxyForField(field, frame, frames) {
-  return new Proxy(
-    {},
-    {
-      get: (obj, key) => {
-        if (key === "name") {
-          return field.name;
+    if (this.hasAllValue()) {
+      if (!this.state.includeAll) {
+        stateUpdate.value = options[0].value;
+        stateUpdate.text = options[0].label;
+        if (this.state.isMulti) {
+          stateUpdate.value = [stateUpdate.value];
+          stateUpdate.text = [stateUpdate.text];
         }
-        if (key === "displayName") {
-          return data.getFieldDisplayName(field, frame, frames);
+      }
+      return stateUpdate;
+    }
+    if (this.state.isMulti) {
+      const currentValues = Array.isArray(currentValue) ? currentValue : [currentValue];
+      const validValues = currentValues.filter((v) => options.find((o) => o.value === v));
+      const validTexts = validValues.map((v) => options.find((o) => o.value === v).label);
+      if (validValues.length === 0) {
+        const defaultState = this.getDefaultMultiState(options);
+        stateUpdate.value = defaultState.value;
+        stateUpdate.text = defaultState.text;
+      } else {
+        if (!lodash.isEqual(validValues, currentValue)) {
+          stateUpdate.value = validValues;
         }
-        if (key === "labels" || key === "formattedLabels") {
-          if (!field.labels) {
-            return "";
-          }
-          return __spreadProps$s(__spreadValues$H({}, field.labels), {
-            __values: Object.values(field.labels).sort().join(", "),
-            toString: () => {
-              return data.formatLabels(field.labels, "", true);
-            }
-          });
+        if (!lodash.isEqual(validTexts, currentText)) {
+          stateUpdate.text = validTexts;
         }
-        return void 0;
       }
+      return stateUpdate;
     }
-  );
-}
-
-class ValueMacro {
-  constructor(name, sceneObject, _match, _scopedVars) {
-    this._match = _match;
-    this._scopedVars = _scopedVars;
-    this.state = { name, type: "__value" };
-  }
-  getValue(fieldPath) {
-    var _a, _b;
-    const dataContext = (_a = this._scopedVars) == null ? void 0 : _a.__dataContext;
-    if (!dataContext) {
-      return this._match;
-    }
-    const { frame, rowIndex, field, calculatedValue } = dataContext.value;
-    if (calculatedValue) {
-      switch (fieldPath) {
-        case "numeric":
-          return calculatedValue.numeric;
-        case "raw":
-          return calculatedValue.numeric;
-        case "time":
-          return "";
-        case "text":
-        default:
-          return data.formattedValueToString(calculatedValue);
+    let matchingOption = findOptionMatchingCurrent(currentValue, currentText, options);
+    if (matchingOption) {
+      stateUpdate.text = matchingOption.label;
+      stateUpdate.value = matchingOption.value;
+    } else {
+      if (this.state.defaultToAll) {
+        stateUpdate.value = ALL_VARIABLE_VALUE;
+        stateUpdate.text = ALL_VARIABLE_TEXT;
+      } else {
+        stateUpdate.value = options[0].value;
+        stateUpdate.text = options[0].label;
       }
     }
-    if (rowIndex == null) {
-      return this._match;
-    }
-    if (fieldPath === "time") {
-      const timeField = frame.fields.find((f) => f.type === data.FieldType.time);
-      return timeField ? timeField.values.get(rowIndex) : void 0;
-    }
-    if (!field) {
-      return this._match;
-    }
-    const value = field.values.get(rowIndex);
-    if (fieldPath === "raw") {
-      return value;
+    return stateUpdate;
+  }
+  interceptStateUpdateAfterValidation(stateUpdate) {
+    const isAllValueFix = stateUpdate.value === ALL_VARIABLE_VALUE && this.state.text === ALL_VARIABLE_TEXT;
+    if (this.skipNextValidation && stateUpdate.value !== this.state.value && stateUpdate.text !== this.state.text && !isAllValueFix) {
+      stateUpdate.value = this.state.value;
+      stateUpdate.text = this.state.text;
     }
-    const displayProcessor = (_b = field.display) != null ? _b : fallbackDisplayProcessor;
-    const result = displayProcessor(value);
-    switch (fieldPath) {
-      case "numeric":
-        return result.numeric;
-      case "text":
-      default:
-        return data.formattedValueToString(result);
+    this.skipNextValidation = false;
+  }
+  getValue() {
+    if (this.hasAllValue()) {
+      if (this.state.allValue) {
+        return new CustomAllValue(this.state.allValue, this);
+      }
+      return this.state.options.map((x) => x.value);
     }
+    return this.state.value;
   }
   getValueText() {
-    return "";
-  }
-}
-const fallbackDisplayProcessor = data.getDisplayProcessor();
-class DataMacro {
-  constructor(name, sceneObject, _match, _scopedVars) {
-    this._match = _match;
-    this._scopedVars = _scopedVars;
-    this.state = { name, type: "__data" };
-  }
-  getValue(fieldPath) {
-    var _a, _b;
-    const dataContext = (_a = this._scopedVars) == null ? void 0 : _a.__dataContext;
-    if (!dataContext || !fieldPath) {
-      return this._match;
+    if (this.hasAllValue()) {
+      return ALL_VARIABLE_TEXT;
     }
-    const { frame, rowIndex } = dataContext.value;
-    if (rowIndex === void 0 || fieldPath === void 0) {
-      return this._match;
+    if (Array.isArray(this.state.text)) {
+      return this.state.text.join(" + ");
     }
-    const obj = {
-      name: frame.name,
-      refId: frame.refId,
-      fields: data.getFieldDisplayValuesProxy({ frame, rowIndex })
-    };
-    return (_b = getFieldAccessor(fieldPath)(obj)) != null ? _b : "";
-  }
-  getValueText() {
-    return "";
+    return String(this.state.text);
   }
-}
-class SeriesMacro {
-  constructor(name, sceneObject, _match, _scopedVars) {
-    this._match = _match;
-    this._scopedVars = _scopedVars;
-    this.state = { name, type: "__series" };
+  hasAllValue() {
+    const value = this.state.value;
+    return value === ALL_VARIABLE_VALUE || Array.isArray(value) && value[0] === ALL_VARIABLE_VALUE;
   }
-  getValue(fieldPath) {
-    var _a;
-    const dataContext = (_a = this._scopedVars) == null ? void 0 : _a.__dataContext;
-    if (!dataContext || !fieldPath) {
-      return this._match;
+  getDefaultMultiState(options) {
+    if (this.state.defaultToAll) {
+      return { value: [ALL_VARIABLE_VALUE], text: [ALL_VARIABLE_TEXT] };
+    } else if (options.length > 0) {
+      return { value: [options[0].value], text: [options[0].label] };
+    } else {
+      return { value: [], text: [] };
     }
-    if (fieldPath !== "name") {
-      return this._match;
+  }
+  changeValueTo(value, text) {
+    if (value === this.state.value && text === this.state.text) {
+      return;
     }
-    const { frame, frameIndex } = dataContext.value;
-    return data.getFrameDisplayName(frame, frameIndex);
+    if (!text) {
+      if (Array.isArray(value)) {
+        text = value.map((v) => this.findLabelTextForValue(v));
+      } else {
+        text = this.findLabelTextForValue(value);
+      }
+    }
+    if (Array.isArray(value)) {
+      if (value.length === 0) {
+        const state = this.getDefaultMultiState(this.state.options);
+        value = state.value;
+        text = state.text;
+      }
+      if (value[value.length - 1] === ALL_VARIABLE_VALUE) {
+        value = [ALL_VARIABLE_VALUE];
+        text = [ALL_VARIABLE_TEXT];
+      } else if (value[0] === ALL_VARIABLE_VALUE && value.length > 1) {
+        value.shift();
+        if (Array.isArray(text)) {
+          text.shift();
+        }
+      }
+    }
+    if (lodash.isEqual(value, this.state.value) && lodash.isEqual(text, this.state.text)) {
+      return;
+    }
+    this.setStateHelper({ value, text, loading: false });
+    this.publishEvent(new SceneVariableValueChangedEvent(this), true);
   }
-  getValueText() {
-    return "";
+  findLabelTextForValue(value) {
+    if (value === ALL_VARIABLE_VALUE) {
+      return ALL_VARIABLE_TEXT;
+    }
+    const option = this.state.options.find((x) => x.value === value);
+    if (option) {
+      return option.label;
+    }
+    const optionByLabel = this.state.options.find((x) => x.label === value);
+    if (optionByLabel) {
+      return optionByLabel.label;
+    }
+    return value;
   }
-}
-class FieldMacro {
-  constructor(name, sceneObject, _match, _scopedVars) {
-    this._match = _match;
-    this._scopedVars = _scopedVars;
-    this.state = { name, type: "__field" };
+  setStateHelper(state) {
+    setBaseClassState(this, state);
   }
-  getValue(fieldPath) {
-    var _a, _b;
-    const dataContext = (_a = this._scopedVars) == null ? void 0 : _a.__dataContext;
-    if (!dataContext || !fieldPath) {
-      return this._match;
+  getOptionsForSelect() {
+    let options = this.state.options;
+    if (this.state.includeAll) {
+      options = [{ value: ALL_VARIABLE_VALUE, label: ALL_VARIABLE_TEXT }, ...options];
     }
-    if (fieldPath === void 0 || fieldPath === "") {
-      return this._match;
+    if (!Array.isArray(this.state.value)) {
+      const current = options.find((x) => x.value === this.state.value);
+      if (!current) {
+        options = [{ value: this.state.value, label: String(this.state.text) }, ...options];
+      }
     }
-    const { frame, field, data } = dataContext.value;
-    const obj = getTemplateProxyForField(field, frame, data);
-    return (_b = getFieldAccessor(fieldPath)(obj)) != null ? _b : "";
+    return options;
   }
-  getValueText() {
-    return "";
+  refreshOptions() {
+    this.getValueOptions({}).subscribe((options) => {
+      this.updateValueGivenNewOptions(options);
+    });
   }
 }
-
-class UrlMacro {
-  constructor(name, _) {
-    this.state = { name, type: "url_macro" };
+function findOptionMatchingCurrent(currentValue, currentText, options) {
+  let textMatch;
+  for (const item of options) {
+    if (item.value === currentValue) {
+      return item;
+    }
+    if (item.label === currentText) {
+      textMatch = item;
+    }
   }
-  getValue(fieldPath) {
-    var _a;
-    const location = runtime.locationService.getLocation();
-    const subUrl = (_a = runtime.config.appSubUrl) != null ? _a : "";
-    switch (fieldPath != null ? fieldPath : "") {
-      case "params":
-        return new UrlStateFormatter(location.search);
-      case "path":
-        return subUrl + location.pathname;
-      case "":
-      default:
-        return subUrl + location.pathname + location.search;
+  return textMatch;
+}
+class MultiValueUrlSyncHandler {
+  constructor(_sceneObject) {
+    this._sceneObject = _sceneObject;
+  }
+  getKey() {
+    return `var-${this._sceneObject.state.name}`;
+  }
+  getKeys() {
+    if (this._sceneObject.state.skipUrlSync) {
+      return [];
     }
+    return [this.getKey()];
   }
-  getValueText() {
-    return "";
+  getUrlState() {
+    if (this._sceneObject.state.skipUrlSync) {
+      return {};
+    }
+    let urlValue = null;
+    let value = this._sceneObject.state.value;
+    if (Array.isArray(value)) {
+      urlValue = value.map(String);
+    } else if (this._sceneObject.state.isMulti) {
+      urlValue = [String(value)];
+    } else {
+      urlValue = String(value);
+    }
+    return { [this.getKey()]: urlValue };
+  }
+  updateFromUrl(values) {
+    let urlValue = values[this.getKey()];
+    if (urlValue != null) {
+      if (this._sceneObject.state.includeAll) {
+        urlValue = handleLegacyUrlAllValue(urlValue);
+      }
+      if (this._sceneObject.state.allValue && this._sceneObject.state.allValue === urlValue) {
+        urlValue = ALL_VARIABLE_VALUE;
+      }
+      if (!this._sceneObject.isActive) {
+        this._sceneObject.skipNextValidation = true;
+      }
+      this._sceneObject.changeValueTo(urlValue);
+    }
   }
 }
-class UrlStateFormatter {
-  constructor(_urlQueryParams) {
-    this._urlQueryParams = _urlQueryParams;
+function handleLegacyUrlAllValue(value) {
+  if (lodash.isArray(value) && value[0] === ALL_VARIABLE_TEXT) {
+    return [ALL_VARIABLE_VALUE];
+  } else if (value === ALL_VARIABLE_TEXT) {
+    return ALL_VARIABLE_VALUE;
   }
-  formatter(options) {
-    if (!options) {
-      return this._urlQueryParams;
+  return value;
+}
+class CustomAllValue {
+  constructor(_value, _variable) {
+    this._value = _value;
+    this._variable = _variable;
+  }
+  formatter(formatNameOrFn) {
+    if (formatNameOrFn === schema.VariableFormatID.Text) {
+      return ALL_VARIABLE_TEXT;
     }
-    const params = options.split(":");
-    if (params[0] === "exclude" && params.length > 1) {
-      const allParams = new URLSearchParams(this._urlQueryParams);
-      for (const param of params[1].split(",")) {
-        allParams.delete(param);
-      }
-      return `?${allParams}`;
+    if (formatNameOrFn === schema.VariableFormatID.PercentEncode) {
+      return formatRegistry.get(schema.VariableFormatID.PercentEncode).formatter(this._value, [], this._variable);
     }
-    if (params[0] === "include" && params.length > 1) {
-      const allParams = new URLSearchParams(this._urlQueryParams);
-      const includeOnly = params[1].split(",");
-      for (const param of allParams.keys()) {
-        if (!includeOnly.includes(param)) {
-          allParams.delete(param);
-        }
-      }
-      return `?${allParams}`;
+    if (formatNameOrFn === schema.VariableFormatID.QueryParam) {
+      return formatRegistry.get(schema.VariableFormatID.QueryParam).formatter(ALL_VARIABLE_TEXT, [], this._variable);
     }
-    return this._urlQueryParams;
+    return this._value;
   }
 }
 
-class UserMacro {
-  constructor(name, _) {
-    this.state = { name, type: "user_macro" };
+class AllVariablesMacro {
+  constructor(name, sceneObject) {
+    this.state = { name, type: "url_variable" };
+    this._sceneObject = sceneObject;
   }
-  getValue(fieldPath) {
-    const user = runtime.config.bootData.user;
-    switch (fieldPath) {
-      case "login":
-        return user.login;
-      case "email":
-        return user.email;
-      case "id":
-      default:
-        return String(user.id);
+  getValue() {
+    const allVars = collectAllVariables(this._sceneObject);
+    const format = formatRegistry.get(schema.VariableFormatID.QueryParam);
+    const params = [];
+    for (const name of Object.keys(allVars)) {
+      const variable = allVars[name];
+      if (variable instanceof MultiValueVariable && variable.hasAllValue() && !variable.state.allValue) {
+        params.push(format.formatter(ALL_VARIABLE_VALUE, [], variable));
+        continue;
+      }
+      const value = variable.getValue();
+      if (!value) {
+        continue;
+      }
+      if (isCustomVariableValue(value)) {
+        params.push(value.formatter(schema.VariableFormatID.QueryParam));
+      } else {
+        params.push(format.formatter(value, [], variable));
+      }
     }
+    return new SkipFormattingValue(params.join("&"));
   }
   getValueText() {
     return "";
   }
 }
-class OrgMacro {
-  constructor(name, _) {
-    this.state = { name, type: "org_macro" };
-  }
-  getValue(fieldPath) {
-    const user = runtime.config.bootData.user;
-    switch (fieldPath) {
-      case "name":
-        return user.orgName;
-      case "id":
-      default:
-        return String(user.orgId);
+function collectAllVariables(sceneObject, record = {}) {
+  if (sceneObject.state.$variables) {
+    for (const variable of sceneObject.state.$variables.state.variables) {
+      if (variable.state.skipUrlSync) {
+        continue;
+      }
+      if (!record[variable.state.name]) {
+        record[variable.state.name] = variable;
+      }
     }
   }
-  getValueText() {
-    return "";
+  if (sceneObject.parent) {
+    collectAllVariables(sceneObject.parent, record);
   }
+  return record;
 }
 
-const macrosIndex = /* @__PURE__ */ new Map([
-  [data.DataLinkBuiltInVars.includeVars, AllVariablesMacro],
-  [data.DataLinkBuiltInVars.keepTime, UrlTimeRangeMacro],
-  ["__value", ValueMacro],
-  ["__data", DataMacro],
-  ["__series", SeriesMacro],
-  ["__field", FieldMacro],
-  ["__url", UrlMacro],
-  ["__from", TimeFromAndToMacro],
-  ["__to", TimeFromAndToMacro],
-  ["__timezone", TimezoneMacro],
-  ["__user", UserMacro],
-  ["__org", OrgMacro],
-  ["__interval", IntervalMacro],
-  ["__interval_ms", IntervalMacro]
-]);
-function registerVariableMacro(name, macro) {
-  if (macrosIndex.get(name)) {
-    throw new Error(`Macro already registered ${name}`);
-  }
-  macrosIndex.set(name, macro);
-  return () => {
-    macrosIndex.delete(name);
-  };
+var __defProp$H = Object.defineProperty;
+var __defProps$s = Object.defineProperties;
+var __getOwnPropDescs$s = 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) => {
+  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]);
+    }
+  return a;
+};
+var __spreadProps$s = (a, b) => __defProps$s(a, __getOwnPropDescs$s(b));
+function getTemplateProxyForField(field, frame, frames) {
+  return new Proxy(
+    {},
+    {
+      get: (obj, key) => {
+        if (key === "name") {
+          return field.name;
+        }
+        if (key === "displayName") {
+          return data.getFieldDisplayName(field, frame, frames);
+        }
+        if (key === "labels" || key === "formattedLabels") {
+          if (!field.labels) {
+            return "";
+          }
+          return __spreadProps$s(__spreadValues$H({}, field.labels), {
+            __values: Object.values(field.labels).sort().join(", "),
+            toString: () => {
+              return data.formatLabels(field.labels, "", true);
+            }
+          });
+        }
+        return void 0;
+      }
+    }
+  );
 }
 
-function sceneInterpolator(sceneObject, target, scopedVars, format, interpolations) {
-  if (!target || typeof target !== "string") {
-    return target != null ? target : "";
+class ValueMacro {
+  constructor(name, sceneObject, _match, _scopedVars) {
+    this._match = _match;
+    this._scopedVars = _scopedVars;
+    this.state = { name, type: "__value" };
   }
-  VARIABLE_REGEX.lastIndex = 0;
-  return target.replace(VARIABLE_REGEX, (match, var1, var2, fmt2, var3, fieldPath, fmt3) => {
-    const variableName = var1 || var2 || var3;
-    const fmt = fmt2 || fmt3 || format;
-    const variable = lookupFormatVariable(variableName, match, scopedVars, sceneObject);
-    if (!variable) {
-      if (interpolations) {
-        interpolations.push({ match, variableName, fieldPath, format: fmt, value: match, found: false });
+  getValue(fieldPath) {
+    var _a, _b;
+    const dataContext = (_a = this._scopedVars) == null ? void 0 : _a.__dataContext;
+    if (!dataContext) {
+      return this._match;
+    }
+    const { frame, rowIndex, field, calculatedValue } = dataContext.value;
+    if (calculatedValue) {
+      switch (fieldPath) {
+        case "numeric":
+          return calculatedValue.numeric;
+        case "raw":
+          return calculatedValue.numeric;
+        case "time":
+          return "";
+        case "text":
+        default:
+          return data.formattedValueToString(calculatedValue);
       }
-      return match;
     }
-    const value = formatValue(sceneObject, variable, variable.getValue(fieldPath), fmt);
-    if (interpolations) {
-      interpolations.push({ match, variableName, fieldPath, format: fmt, value, found: value !== match });
+    if (rowIndex == null) {
+      return this._match;
     }
-    return value;
-  });
-}
-function lookupFormatVariable(name, match, scopedVars, sceneObject) {
-  if (scopedVars && scopedVars.hasOwnProperty(name)) {
-    const scopedVar = scopedVars[name];
-    if (scopedVar) {
-      return getSceneVariableForScopedVar(name, scopedVar);
+    if (fieldPath === "time") {
+      const timeField = frame.fields.find((f) => f.type === data.FieldType.time);
+      return timeField ? timeField.values.get(rowIndex) : void 0;
+    }
+    if (!field) {
+      return this._match;
+    }
+    const value = field.values.get(rowIndex);
+    if (fieldPath === "raw") {
+      return value;
+    }
+    const displayProcessor = (_b = field.display) != null ? _b : fallbackDisplayProcessor;
+    const result = displayProcessor(value);
+    switch (fieldPath) {
+      case "numeric":
+        return result.numeric;
+      case "text":
+      default:
+        return data.formattedValueToString(result);
     }
   }
-  const variable = lookupVariable(name, sceneObject);
-  if (variable) {
-    return variable;
-  }
-  const Macro = macrosIndex.get(name);
-  if (Macro) {
-    return new Macro(name, sceneObject, match, scopedVars);
+  getValueText() {
+    return "";
   }
-  return null;
 }
-function formatValue(context, variable, value, formatNameOrFn) {
-  if (value === null || value === void 0) {
-    return "";
+const fallbackDisplayProcessor = data.getDisplayProcessor();
+class DataMacro {
+  constructor(name, sceneObject, _match, _scopedVars) {
+    this._match = _match;
+    this._scopedVars = _scopedVars;
+    this.state = { name, type: "__data" };
   }
-  if (isCustomVariableValue(value)) {
-    return sceneInterpolator(context, value.formatter(formatNameOrFn));
+  getValue(fieldPath) {
+    var _a, _b;
+    const dataContext = (_a = this._scopedVars) == null ? void 0 : _a.__dataContext;
+    if (!dataContext || !fieldPath) {
+      return this._match;
+    }
+    const { frame, rowIndex } = dataContext.value;
+    if (rowIndex === void 0 || fieldPath === void 0) {
+      return this._match;
+    }
+    const obj = {
+      name: frame.name,
+      refId: frame.refId,
+      fields: data.getFieldDisplayValuesProxy({ frame, rowIndex })
+    };
+    return (_b = getFieldAccessor(fieldPath)(obj)) != null ? _b : "";
   }
-  if (!Array.isArray(value) && typeof value === "object") {
-    value = `${value}`;
+  getValueText() {
+    return "";
   }
-  if (typeof formatNameOrFn === "function") {
-    return formatNameOrFn(value, {
-      name: variable.state.name,
-      type: variable.state.type,
-      multi: variable.state.isMulti,
-      includeAll: variable.state.includeAll
-    });
+}
+class SeriesMacro {
+  constructor(name, sceneObject, _match, _scopedVars) {
+    this._match = _match;
+    this._scopedVars = _scopedVars;
+    this.state = { name, type: "__series" };
   }
-  let args = [];
-  if (!formatNameOrFn) {
-    formatNameOrFn = schema.VariableFormatID.Glob;
-  } else {
-    args = formatNameOrFn.split(":");
-    if (args.length > 1) {
-      formatNameOrFn = args[0];
-      args = args.slice(1);
-    } else {
-      args = [];
+  getValue(fieldPath) {
+    var _a;
+    const dataContext = (_a = this._scopedVars) == null ? void 0 : _a.__dataContext;
+    if (!dataContext || !fieldPath) {
+      return this._match;
     }
+    if (fieldPath !== "name") {
+      return this._match;
+    }
+    const { frame, frameIndex } = dataContext.value;
+    return data.getFrameDisplayName(frame, frameIndex);
   }
-  let formatter = formatRegistry.getIfExists(formatNameOrFn);
-  if (!formatter) {
-    console.error(`Variable format ${formatNameOrFn} not found. Using glob format as fallback.`);
-    formatter = formatRegistry.get(schema.VariableFormatID.Glob);
+  getValueText() {
+    return "";
   }
-  return formatter.formatter(value, args, variable);
 }
-
-function isSceneObject(obj) {
-  return obj.useState !== void 0;
-}
-function isDataRequestEnricher(obj) {
-  return "enrichDataRequest" in obj;
-}
-function isFiltersRequestEnricher(obj) {
-  return "enrichFiltersRequest" in obj;
-}
-function isDataLayer(obj) {
-  return "isDataLayer" in obj;
-}
-
-var __accessCheck$2 = (obj, member, msg) => {
-  if (!member.has(obj))
+class FieldMacro {
+  constructor(name, sceneObject, _match, _scopedVars) {
+    this._match = _match;
+    this._scopedVars = _scopedVars;
+    this.state = { name, type: "__field" };
+  }
+  getValue(fieldPath) {
+    var _a, _b;
+    const dataContext = (_a = this._scopedVars) == null ? void 0 : _a.__dataContext;
+    if (!dataContext || !fieldPath) {
+      return this._match;
+    }
+    if (fieldPath === void 0 || fieldPath === "") {
+      return this._match;
+    }
+    const { frame, field, data } = dataContext.value;
+    const obj = getTemplateProxyForField(field, frame, data);
+    return (_b = getFieldAccessor(fieldPath)(obj)) != null ? _b : "";
+  }
+  getValueText() {
+    return "";
+  }
+}
+
+class UrlMacro {
+  constructor(name, _) {
+    this.state = { name, type: "url_macro" };
+  }
+  getValue(fieldPath) {
+    var _a;
+    const location = runtime.locationService.getLocation();
+    const subUrl = (_a = runtime.config.appSubUrl) != null ? _a : "";
+    switch (fieldPath != null ? fieldPath : "") {
+      case "params":
+        return new UrlStateFormatter(location.search);
+      case "path":
+        return subUrl + location.pathname;
+      case "":
+      default:
+        return subUrl + location.pathname + location.search;
+    }
+  }
+  getValueText() {
+    return "";
+  }
+}
+class UrlStateFormatter {
+  constructor(_urlQueryParams) {
+    this._urlQueryParams = _urlQueryParams;
+  }
+  formatter(options) {
+    if (!options) {
+      return this._urlQueryParams;
+    }
+    const params = options.split(":");
+    if (params[0] === "exclude" && params.length > 1) {
+      const allParams = new URLSearchParams(this._urlQueryParams);
+      for (const param of params[1].split(",")) {
+        allParams.delete(param);
+      }
+      return `?${allParams}`;
+    }
+    if (params[0] === "include" && params.length > 1) {
+      const allParams = new URLSearchParams(this._urlQueryParams);
+      const includeOnly = params[1].split(",");
+      for (const param of allParams.keys()) {
+        if (!includeOnly.includes(param)) {
+          allParams.delete(param);
+        }
+      }
+      return `?${allParams}`;
+    }
+    return this._urlQueryParams;
+  }
+}
+
+class UserMacro {
+  constructor(name, _) {
+    this.state = { name, type: "user_macro" };
+  }
+  getValue(fieldPath) {
+    const user = runtime.config.bootData.user;
+    switch (fieldPath) {
+      case "login":
+        return user.login;
+      case "email":
+        return user.email;
+      case "id":
+      default:
+        return String(user.id);
+    }
+  }
+  getValueText() {
+    return "";
+  }
+}
+class OrgMacro {
+  constructor(name, _) {
+    this.state = { name, type: "org_macro" };
+  }
+  getValue(fieldPath) {
+    const user = runtime.config.bootData.user;
+    switch (fieldPath) {
+      case "name":
+        return user.orgName;
+      case "id":
+      default:
+        return String(user.orgId);
+    }
+  }
+  getValueText() {
+    return "";
+  }
+}
+
+const macrosIndex = /* @__PURE__ */ new Map([
+  [data.DataLinkBuiltInVars.includeVars, AllVariablesMacro],
+  [data.DataLinkBuiltInVars.keepTime, UrlTimeRangeMacro],
+  ["__value", ValueMacro],
+  ["__data", DataMacro],
+  ["__series", SeriesMacro],
+  ["__field", FieldMacro],
+  ["__url", UrlMacro],
+  ["__from", TimeFromAndToMacro],
+  ["__to", TimeFromAndToMacro],
+  ["__timezone", TimezoneMacro],
+  ["__user", UserMacro],
+  ["__org", OrgMacro],
+  ["__interval", IntervalMacro],
+  ["__interval_ms", IntervalMacro]
+]);
+function registerVariableMacro(name, macro) {
+  if (macrosIndex.get(name)) {
+    throw new Error(`Macro already registered ${name}`);
+  }
+  macrosIndex.set(name, macro);
+  return () => {
+    macrosIndex.delete(name);
+  };
+}
+
+function sceneInterpolator(sceneObject, target, scopedVars, format, interpolations) {
+  if (!target || typeof target !== "string") {
+    return target != null ? target : "";
+  }
+  VARIABLE_REGEX.lastIndex = 0;
+  return target.replace(VARIABLE_REGEX, (match, var1, var2, fmt2, var3, fieldPath, fmt3) => {
+    const variableName = var1 || var2 || var3;
+    const fmt = fmt2 || fmt3 || format;
+    const variable = lookupFormatVariable(variableName, match, scopedVars, sceneObject);
+    if (!variable) {
+      if (interpolations) {
+        interpolations.push({ match, variableName, fieldPath, format: fmt, value: match, found: false });
+      }
+      return match;
+    }
+    const value = formatValue(sceneObject, variable, variable.getValue(fieldPath), fmt);
+    if (interpolations) {
+      interpolations.push({ match, variableName, fieldPath, format: fmt, value, found: value !== match });
+    }
+    return value;
+  });
+}
+function lookupFormatVariable(name, match, scopedVars, sceneObject) {
+  if (scopedVars && scopedVars.hasOwnProperty(name)) {
+    const scopedVar = scopedVars[name];
+    if (scopedVar) {
+      return getSceneVariableForScopedVar(name, scopedVar);
+    }
+  }
+  const variable = lookupVariable(name, sceneObject);
+  if (variable) {
+    return variable;
+  }
+  const Macro = macrosIndex.get(name);
+  if (Macro) {
+    return new Macro(name, sceneObject, match, scopedVars);
+  }
+  return null;
+}
+function formatValue(context, variable, value, formatNameOrFn) {
+  if (value === null || value === void 0) {
+    return "";
+  }
+  if (isCustomVariableValue(value)) {
+    return sceneInterpolator(context, value.formatter(formatNameOrFn));
+  }
+  if (!Array.isArray(value) && typeof value === "object") {
+    value = `${value}`;
+  }
+  if (typeof formatNameOrFn === "function") {
+    return formatNameOrFn(value, {
+      name: variable.state.name,
+      type: variable.state.type,
+      multi: variable.state.isMulti,
+      includeAll: variable.state.includeAll
+    });
+  }
+  let args = [];
+  if (!formatNameOrFn) {
+    formatNameOrFn = schema.VariableFormatID.Glob;
+  } else {
+    args = formatNameOrFn.split(":");
+    if (args.length > 1) {
+      formatNameOrFn = args[0];
+      args = args.slice(1);
+    } else {
+      args = [];
+    }
+  }
+  let formatter = formatRegistry.getIfExists(formatNameOrFn);
+  if (!formatter) {
+    console.error(`Variable format ${formatNameOrFn} not found. Using glob format as fallback.`);
+    formatter = formatRegistry.get(schema.VariableFormatID.Glob);
+  }
+  return formatter.formatter(value, args, variable);
+}
+
+function isSceneObject(obj) {
+  return obj.useState !== void 0;
+}
+function isDataRequestEnricher(obj) {
+  return "enrichDataRequest" in obj;
+}
+function isFiltersRequestEnricher(obj) {
+  return "enrichFiltersRequest" in obj;
+}
+function isDataLayer(obj) {
+  return "isDataLayer" in obj;
+}
+
+var __accessCheck$2 = (obj, member, msg) => {
+  if (!member.has(obj))
     throw TypeError("Cannot " + msg);
 };
 var __privateGet$2 = (obj, member, getter) => {
@@ -1871,602 +2164,313 @@ function writeSceneLog(logger, message, ...rest) {
   if (typeof window !== "undefined") {
     loggingEnabled = localStorage.getItem("grafana.debug.scenes") === "true";
   }
-  if (loggingEnabled) {
-    console.log(`${logger}: `, message, ...rest);
-  }
-}
-
-async function getDataSource(datasource, scopedVars) {
-  if (datasource == null ? void 0 : datasource.uid) {
-    const runtimeDataSource = runtimeDataSources.get(datasource.uid);
-    if (runtimeDataSource) {
-      return runtimeDataSource;
-    }
-  }
-  if (datasource && datasource.query) {
-    return datasource;
-  }
-  return await runtime.getDataSourceSrv().get(datasource, scopedVars);
-}
-
-class VariableValueRecorder {
-  constructor() {
-    this._values = /* @__PURE__ */ new Map();
-  }
-  recordCurrentDependencyValuesForSceneObject(sceneObject) {
-    this.clearValues();
-    if (!sceneObject.variableDependency) {
-      return;
-    }
-    for (const variableName of sceneObject.variableDependency.getNames()) {
-      const variable = sceneGraph.lookupVariable(variableName, sceneObject);
-      if (variable) {
-        this._values.set(variable.state.name, variable.getValue());
-      }
-    }
-  }
-  cloneAndRecordCurrentValuesForSceneObject(sceneObject) {
-    const clone = new VariableValueRecorder();
-    clone.recordCurrentDependencyValuesForSceneObject(sceneObject);
-    return clone;
-  }
-  clearValues() {
-    this._values.clear();
-  }
-  hasValues() {
-    return !!this._values;
-  }
-  recordCurrentValue(variable) {
-    this._values.set(variable.state.name, variable.getValue());
-  }
-  hasRecordedValue(variable) {
-    return this._values.has(variable.state.name);
-  }
-  hasValueChanged(variable) {
-    if (this._values.has(variable.state.name)) {
-      const value = this._values.get(variable.state.name);
-      if (!isVariableValueEqual(value, variable.getValue())) {
-        return true;
-      }
-    }
-    return false;
-  }
-  hasDependenciesChanged(sceneObject) {
-    if (!this._values) {
-      return false;
-    }
-    if (!sceneObject.variableDependency) {
-      return false;
-    }
-    for (const variableName of sceneObject.variableDependency.getNames()) {
-      const variable = sceneGraph.lookupVariable(variableName, sceneObject);
-      if (!variable) {
-        continue;
-      }
-      const name = variable.state.name;
-      if (variable && this._values.has(name)) {
-        const value = this._values.get(name);
-        if (!isVariableValueEqual(value, variable.getValue())) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-}
-
-function isExtraQueryProvider(obj) {
-  return typeof obj === "object" && "getExtraQueries" in obj;
-}
-
-var __defProp$G = Object.defineProperty;
-var __defProps$r = Object.defineProperties;
-var __getOwnPropDescs$r = 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) => {
-  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]);
-    }
-  return a;
-};
-var __spreadProps$r = (a, b) => __defProps$r(a, __getOwnPropDescs$r(b));
-const passthroughProcessor = (_, secondary) => rxjs.of(secondary);
-const extraQueryProcessingOperator = (processors) => (data) => {
-  return data.pipe(
-    rxjs.mergeMap(([primary, ...secondaries]) => {
-      const processedSecondaries = secondaries.flatMap((s) => {
-        var _a, _b;
-        return (_b = (_a = processors.get(s.request.requestId)) == null ? void 0 : _a(primary, s)) != null ? _b : rxjs.of(s);
-      });
-      return rxjs.forkJoin([rxjs.of(primary), ...processedSecondaries]);
-    }),
-    rxjs.map(([primary, ...processedSecondaries]) => {
-      var _a;
-      return __spreadProps$r(__spreadValues$G({}, primary), {
-        series: [...primary.series, ...processedSecondaries.flatMap((s) => s.series)],
-        annotations: [...(_a = primary.annotations) != null ? _a : [], ...processedSecondaries.flatMap((s) => {
-          var _a2;
-          return (_a2 = s.annotations) != null ? _a2 : [];
-        })]
-      });
-    })
-  );
-};
-
-var __defProp$F = Object.defineProperty;
-var __defProps$q = Object.defineProperties;
-var __getOwnPropDescs$q = 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) => {
-  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]);
-    }
-  return a;
-};
-var __spreadProps$q = (a, b) => __defProps$q(a, __getOwnPropDescs$q(b));
-function filterAnnotations(data, filters) {
-  var _a;
-  if (!Array.isArray(data) || data.length === 0) {
-    return data;
-  }
-  const rows = Array.from({ length: data.length }, () => /* @__PURE__ */ new Set());
-  let frameIdx = 0;
-  for (const frame of data) {
-    for (let index = 0; index < frame.length; index++) {
-      if (rows[frameIdx].has(index)) {
-        continue;
-      }
-      let matching = true;
-      const panelIdField = frame.fields.find((f) => f.name === "panelId");
-      const sourceField = frame.fields.find((f) => f.name === "source");
-      if (sourceField) {
-        if (panelIdField && sourceField.values[index].type === "dashboard") {
-          matching = panelIdField.values[index] === filters.panelId;
-        }
-        const sourceFilter = sourceField.values[index].filter;
-        if (sourceFilter) {
-          const includes = ((_a = sourceFilter.ids) != null ? _a : []).includes(filters.panelId);
-          if (sourceFilter.exclude) {
-            if (includes) {
-              matching = false;
-            }
-          } else if (!includes) {
-            matching = false;
-          }
-        }
-      }
-      if (matching) {
-        rows[frameIdx].add(index);
-      }
-    }
-    frameIdx++;
-  }
-  const processed = [];
-  frameIdx = 0;
-  for (const frame of data) {
-    const frameLength = rows[frameIdx].size;
-    const fields = [];
-    for (const field of frame.fields) {
-      const buffer = [];
-      for (let index = 0; index < frame.length; index++) {
-        if (rows[frameIdx].has(index)) {
-          buffer.push(field.values[index]);
-          continue;
-        }
-      }
-      fields.push(__spreadProps$q(__spreadValues$F({}, field), {
-        values: buffer
-      }));
-    }
-    processed.push(__spreadProps$q(__spreadValues$F({}, frame), {
-      fields,
-      length: frameLength
-    }));
-    frameIdx++;
-  }
-  return processed;
-}
-
-function getEnrichedDataRequest(sourceRunner) {
-  const root = sourceRunner.getRoot();
-  if (isDataRequestEnricher(root)) {
-    return root.enrichDataRequest(sourceRunner);
-  }
-  return null;
-}
-
-let originalGetAdhocFilters = void 0;
-let allActiveFilterSets = /* @__PURE__ */ new Set();
-function patchGetAdhocFilters(filterVar) {
-  filterVar.addActivationHandler(() => {
-    allActiveFilterSets.add(filterVar);
-    return () => allActiveFilterSets.delete(filterVar);
-  });
-  if (originalGetAdhocFilters) {
-    return;
-  }
-  const templateSrv = runtime.getTemplateSrv();
-  if (!(templateSrv == null ? void 0 : templateSrv.getAdhocFilters)) {
-    console.log("Failed to patch getAdhocFilters");
-    return;
-  }
-  originalGetAdhocFilters = templateSrv.getAdhocFilters;
-  templateSrv.getAdhocFilters = function getAdhocFiltersScenePatch(dsName) {
-    var _a;
-    if (allActiveFilterSets.size === 0) {
-      return originalGetAdhocFilters.call(templateSrv);
-    }
-    const ds = runtime.getDataSourceSrv().getInstanceSettings(dsName);
-    if (!ds) {
-      return [];
-    }
-    for (const filter of allActiveFilterSets.values()) {
-      if (((_a = filter.state.datasource) == null ? void 0 : _a.uid) === ds.uid) {
-        return filter.state.filters;
-      }
-    }
-    return [];
-  }.bind(templateSrv);
-}
-function findActiveAdHocFilterVariableByUid(dsUid) {
-  var _a;
-  for (const filter of allActiveFilterSets.values()) {
-    if (((_a = filter.state.datasource) == null ? void 0 : _a.uid) === dsUid) {
-      return filter;
-    }
-  }
-  return void 0;
-}
-
-function registerQueryWithController(entry) {
-  return (queryStream) => {
-    const queryControler = sceneGraph.getQueryController(entry.origin);
-    if (!queryControler) {
-      return queryStream;
-    }
-    return new rxjs.Observable((observer) => {
-      if (!entry.cancel) {
-        entry.cancel = () => observer.complete();
-      }
-      queryControler.queryStarted(entry);
-      let markedAsCompleted = false;
-      const sub = queryStream.subscribe({
-        next: (v) => {
-          if (!markedAsCompleted && v.state !== schema.LoadingState.Loading) {
-            markedAsCompleted = true;
-            queryControler.queryCompleted(entry);
-          }
-          observer.next(v);
-        },
-        error: (e) => observer.error(e),
-        complete: () => {
-          observer.complete();
-        }
-      });
-      return () => {
-        sub.unsubscribe();
-        if (!markedAsCompleted) {
-          queryControler.queryCompleted(entry);
-        }
-      };
-    });
-  };
-}
-
-const allActiveGroupByVariables = /* @__PURE__ */ new Set();
-function findActiveGroupByVariablesByUid(dsUid) {
-  var _a;
-  for (const groupByVariable of allActiveGroupByVariables.values()) {
-    if (((_a = groupByVariable.state.datasource) == null ? void 0 : _a.uid) === dsUid) {
-      return groupByVariable;
-    }
+  if (loggingEnabled) {
+    console.log(`${logger}: `, message, ...rest);
   }
-  return void 0;
 }
 
-function setBaseClassState(sceneObject, newState) {
-  sceneObject.setState(newState);
-}
-function useLocationServiceSafe() {
-  return runtime.useLocationService ? runtime.useLocationService() : runtime.locationService;
+async function getDataSource(datasource, scopedVars) {
+  if (datasource == null ? void 0 : datasource.uid) {
+    const runtimeDataSource = runtimeDataSources.get(datasource.uid);
+    if (runtimeDataSource) {
+      return runtimeDataSource;
+    }
+  }
+  if (datasource && datasource.query) {
+    return datasource;
+  }
+  return await runtime.getDataSourceSrv().get(datasource, scopedVars);
 }
 
-class MultiValueVariable extends SceneObjectBase {
+class VariableValueRecorder {
   constructor() {
-    super(...arguments);
-    this._urlSync = new MultiValueUrlSyncHandler(this);
-  }
-  validateAndUpdate() {
-    return this.getValueOptions({}).pipe(
-      rxjs.map((options) => {
-        this.updateValueGivenNewOptions(options);
-        return {};
-      })
-    );
-  }
-  onCancel() {
-    this.setStateHelper({ loading: false });
-    const sceneVarSet = this.parent;
-    sceneVarSet == null ? void 0 : sceneVarSet.cancel(this);
-  }
-  updateValueGivenNewOptions(options) {
-    const { value: currentValue, text: currentText, options: oldOptions } = this.state;
-    const stateUpdate = this.getStateUpdateGivenNewOptions(options, currentValue, currentText);
-    this.interceptStateUpdateAfterValidation(stateUpdate);
-    this.setStateHelper(stateUpdate);
-    if (stateUpdate.value !== currentValue || stateUpdate.text !== currentText || this.hasAllValue() && !lodash.isEqual(options, oldOptions)) {
-      this.publishEvent(new SceneVariableValueChangedEvent(this), true);
-    }
+    this._values = /* @__PURE__ */ new Map();
   }
-  getStateUpdateGivenNewOptions(options, currentValue, currentText) {
-    const stateUpdate = {
-      options,
-      loading: false,
-      value: currentValue,
-      text: currentText
-    };
-    if (options.length === 0) {
-      if (this.state.defaultToAll || this.state.includeAll) {
-        stateUpdate.value = ALL_VARIABLE_VALUE;
-        stateUpdate.text = ALL_VARIABLE_TEXT;
-      } else if (this.state.isMulti) {
-        stateUpdate.value = [];
-        stateUpdate.text = [];
-      } else {
-        stateUpdate.value = "";
-        stateUpdate.text = "";
-      }
-      return stateUpdate;
-    }
-    if (this.hasAllValue()) {
-      if (!this.state.includeAll) {
-        stateUpdate.value = options[0].value;
-        stateUpdate.text = options[0].label;
-        if (this.state.isMulti) {
-          stateUpdate.value = [stateUpdate.value];
-          stateUpdate.text = [stateUpdate.text];
-        }
-      }
-      return stateUpdate;
-    }
-    if (this.state.isMulti) {
-      const currentValues = Array.isArray(currentValue) ? currentValue : [currentValue];
-      const validValues = currentValues.filter((v) => options.find((o) => o.value === v));
-      const validTexts = validValues.map((v) => options.find((o) => o.value === v).label);
-      if (validValues.length === 0) {
-        const defaultState = this.getDefaultMultiState(options);
-        stateUpdate.value = defaultState.value;
-        stateUpdate.text = defaultState.text;
-      } else {
-        if (!lodash.isEqual(validValues, currentValue)) {
-          stateUpdate.value = validValues;
-        }
-        if (!lodash.isEqual(validTexts, currentText)) {
-          stateUpdate.text = validTexts;
-        }
-      }
-      return stateUpdate;
+  recordCurrentDependencyValuesForSceneObject(sceneObject) {
+    this.clearValues();
+    if (!sceneObject.variableDependency) {
+      return;
     }
-    let matchingOption = findOptionMatchingCurrent(currentValue, currentText, options);
-    if (matchingOption) {
-      stateUpdate.text = matchingOption.label;
-      stateUpdate.value = matchingOption.value;
-    } else {
-      if (this.state.defaultToAll) {
-        stateUpdate.value = ALL_VARIABLE_VALUE;
-        stateUpdate.text = ALL_VARIABLE_TEXT;
-      } else {
-        stateUpdate.value = options[0].value;
-        stateUpdate.text = options[0].label;
+    for (const variableName of sceneObject.variableDependency.getNames()) {
+      const variable = sceneGraph.lookupVariable(variableName, sceneObject);
+      if (variable) {
+        this._values.set(variable.state.name, variable.getValue());
       }
     }
-    return stateUpdate;
   }
-  interceptStateUpdateAfterValidation(stateUpdate) {
-    const isAllValueFix = stateUpdate.value === ALL_VARIABLE_VALUE && this.state.text === ALL_VARIABLE_TEXT;
-    if (this.skipNextValidation && stateUpdate.value !== this.state.value && stateUpdate.text !== this.state.text && !isAllValueFix) {
-      stateUpdate.value = this.state.value;
-      stateUpdate.text = this.state.text;
-    }
-    this.skipNextValidation = false;
+  cloneAndRecordCurrentValuesForSceneObject(sceneObject) {
+    const clone = new VariableValueRecorder();
+    clone.recordCurrentDependencyValuesForSceneObject(sceneObject);
+    return clone;
   }
-  getValue() {
-    if (this.hasAllValue()) {
-      if (this.state.allValue) {
-        return new CustomAllValue(this.state.allValue, this);
+  clearValues() {
+    this._values.clear();
+  }
+  hasValues() {
+    return !!this._values;
+  }
+  recordCurrentValue(variable) {
+    this._values.set(variable.state.name, variable.getValue());
+  }
+  hasRecordedValue(variable) {
+    return this._values.has(variable.state.name);
+  }
+  hasValueChanged(variable) {
+    if (this._values.has(variable.state.name)) {
+      const value = this._values.get(variable.state.name);
+      if (!isVariableValueEqual(value, variable.getValue())) {
+        return true;
       }
-      return this.state.options.map((x) => x.value);
     }
-    return this.state.value;
+    return false;
   }
-  getValueText() {
-    if (this.hasAllValue()) {
-      return ALL_VARIABLE_TEXT;
+  hasDependenciesChanged(sceneObject) {
+    if (!this._values) {
+      return false;
     }
-    if (Array.isArray(this.state.text)) {
-      return this.state.text.join(" + ");
+    if (!sceneObject.variableDependency) {
+      return false;
     }
-    return String(this.state.text);
-  }
-  hasAllValue() {
-    const value = this.state.value;
-    return value === ALL_VARIABLE_VALUE || Array.isArray(value) && value[0] === ALL_VARIABLE_VALUE;
-  }
-  getDefaultMultiState(options) {
-    if (this.state.defaultToAll) {
-      return { value: [ALL_VARIABLE_VALUE], text: [ALL_VARIABLE_TEXT] };
-    } else if (options.length > 0) {
-      return { value: [options[0].value], text: [options[0].label] };
-    } else {
-      return { value: [], text: [] };
+    for (const variableName of sceneObject.variableDependency.getNames()) {
+      const variable = sceneGraph.lookupVariable(variableName, sceneObject);
+      if (!variable) {
+        continue;
+      }
+      const name = variable.state.name;
+      if (variable && this._values.has(name)) {
+        const value = this._values.get(name);
+        if (!isVariableValueEqual(value, variable.getValue())) {
+          return true;
+        }
+      }
     }
+    return false;
   }
-  changeValueTo(value, text) {
-    if (value === this.state.value && text === this.state.text) {
-      return;
+}
+
+function isExtraQueryProvider(obj) {
+  return typeof obj === "object" && "getExtraQueries" in obj;
+}
+
+var __defProp$G = Object.defineProperty;
+var __defProps$r = Object.defineProperties;
+var __getOwnPropDescs$r = 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) => {
+  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 (!text) {
-      if (Array.isArray(value)) {
-        text = value.map((v) => this.findLabelTextForValue(v));
-      } else {
-        text = this.findLabelTextForValue(value);
-      }
+  return a;
+};
+var __spreadProps$r = (a, b) => __defProps$r(a, __getOwnPropDescs$r(b));
+const passthroughProcessor = (_, secondary) => rxjs.of(secondary);
+const extraQueryProcessingOperator = (processors) => (data) => {
+  return data.pipe(
+    rxjs.mergeMap(([primary, ...secondaries]) => {
+      const processedSecondaries = secondaries.flatMap((s) => {
+        var _a, _b;
+        return (_b = (_a = processors.get(s.request.requestId)) == null ? void 0 : _a(primary, s)) != null ? _b : rxjs.of(s);
+      });
+      return rxjs.forkJoin([rxjs.of(primary), ...processedSecondaries]);
+    }),
+    rxjs.map(([primary, ...processedSecondaries]) => {
+      var _a;
+      return __spreadProps$r(__spreadValues$G({}, primary), {
+        series: [...primary.series, ...processedSecondaries.flatMap((s) => s.series)],
+        annotations: [...(_a = primary.annotations) != null ? _a : [], ...processedSecondaries.flatMap((s) => {
+          var _a2;
+          return (_a2 = s.annotations) != null ? _a2 : [];
+        })]
+      });
+    })
+  );
+};
+
+var __defProp$F = Object.defineProperty;
+var __defProps$q = Object.defineProperties;
+var __getOwnPropDescs$q = 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) => {
+  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 (Array.isArray(value)) {
-      if (value.length === 0) {
-        const state = this.getDefaultMultiState(this.state.options);
-        value = state.value;
-        text = state.text;
+  return a;
+};
+var __spreadProps$q = (a, b) => __defProps$q(a, __getOwnPropDescs$q(b));
+function filterAnnotations(data, filters) {
+  var _a;
+  if (!Array.isArray(data) || data.length === 0) {
+    return data;
+  }
+  const rows = Array.from({ length: data.length }, () => /* @__PURE__ */ new Set());
+  let frameIdx = 0;
+  for (const frame of data) {
+    for (let index = 0; index < frame.length; index++) {
+      if (rows[frameIdx].has(index)) {
+        continue;
       }
-      if (value[value.length - 1] === ALL_VARIABLE_VALUE) {
-        value = [ALL_VARIABLE_VALUE];
-        text = [ALL_VARIABLE_TEXT];
-      } else if (value[0] === ALL_VARIABLE_VALUE && value.length > 1) {
-        value.shift();
-        if (Array.isArray(text)) {
-          text.shift();
+      let matching = true;
+      const panelIdField = frame.fields.find((f) => f.name === "panelId");
+      const sourceField = frame.fields.find((f) => f.name === "source");
+      if (sourceField) {
+        if (panelIdField && sourceField.values[index].type === "dashboard") {
+          matching = panelIdField.values[index] === filters.panelId;
+        }
+        const sourceFilter = sourceField.values[index].filter;
+        if (sourceFilter) {
+          const includes = ((_a = sourceFilter.ids) != null ? _a : []).includes(filters.panelId);
+          if (sourceFilter.exclude) {
+            if (includes) {
+              matching = false;
+            }
+          } else if (!includes) {
+            matching = false;
+          }
         }
       }
+      if (matching) {
+        rows[frameIdx].add(index);
+      }
     }
-    if (lodash.isEqual(value, this.state.value) && lodash.isEqual(text, this.state.text)) {
-      return;
-    }
-    this.setStateHelper({ value, text, loading: false });
-    this.publishEvent(new SceneVariableValueChangedEvent(this), true);
-  }
-  findLabelTextForValue(value) {
-    if (value === ALL_VARIABLE_VALUE) {
-      return ALL_VARIABLE_TEXT;
-    }
-    const option = this.state.options.find((x) => x.value === value);
-    if (option) {
-      return option.label;
-    }
-    const optionByLabel = this.state.options.find((x) => x.label === value);
-    if (optionByLabel) {
-      return optionByLabel.label;
-    }
-    return value;
-  }
-  setStateHelper(state) {
-    setBaseClassState(this, state);
+    frameIdx++;
   }
-  getOptionsForSelect() {
-    let options = this.state.options;
-    if (this.state.includeAll) {
-      options = [{ value: ALL_VARIABLE_VALUE, label: ALL_VARIABLE_TEXT }, ...options];
-    }
-    if (!Array.isArray(this.state.value)) {
-      const current = options.find((x) => x.value === this.state.value);
-      if (!current) {
-        options = [{ value: this.state.value, label: String(this.state.text) }, ...options];
+  const processed = [];
+  frameIdx = 0;
+  for (const frame of data) {
+    const frameLength = rows[frameIdx].size;
+    const fields = [];
+    for (const field of frame.fields) {
+      const buffer = [];
+      for (let index = 0; index < frame.length; index++) {
+        if (rows[frameIdx].has(index)) {
+          buffer.push(field.values[index]);
+          continue;
+        }
       }
+      fields.push(__spreadProps$q(__spreadValues$F({}, field), {
+        values: buffer
+      }));
     }
-    return options;
-  }
-  refreshOptions() {
-    this.getValueOptions({}).subscribe((options) => {
-      this.updateValueGivenNewOptions(options);
-    });
+    processed.push(__spreadProps$q(__spreadValues$F({}, frame), {
+      fields,
+      length: frameLength
+    }));
+    frameIdx++;
   }
+  return processed;
 }
-function findOptionMatchingCurrent(currentValue, currentText, options) {
-  let textMatch;
-  for (const item of options) {
-    if (item.value === currentValue) {
-      return item;
-    }
-    if (item.label === currentText) {
-      textMatch = item;
-    }
+
+function getEnrichedDataRequest(sourceRunner) {
+  const root = sourceRunner.getRoot();
+  if (isDataRequestEnricher(root)) {
+    return root.enrichDataRequest(sourceRunner);
   }
-  return textMatch;
+  return null;
 }
-class MultiValueUrlSyncHandler {
-  constructor(_sceneObject) {
-    this._sceneObject = _sceneObject;
-  }
-  getKey() {
-    return `var-${this._sceneObject.state.name}`;
+
+let originalGetAdhocFilters = void 0;
+let allActiveFilterSets = /* @__PURE__ */ new Set();
+function patchGetAdhocFilters(filterVar) {
+  filterVar.addActivationHandler(() => {
+    allActiveFilterSets.add(filterVar);
+    return () => allActiveFilterSets.delete(filterVar);
+  });
+  if (originalGetAdhocFilters) {
+    return;
   }
-  getKeys() {
-    if (this._sceneObject.state.skipUrlSync) {
-      return [];
-    }
-    return [this.getKey()];
+  const templateSrv = runtime.getTemplateSrv();
+  if (!(templateSrv == null ? void 0 : templateSrv.getAdhocFilters)) {
+    console.log("Failed to patch getAdhocFilters");
+    return;
   }
-  getUrlState() {
-    if (this._sceneObject.state.skipUrlSync) {
-      return {};
+  originalGetAdhocFilters = templateSrv.getAdhocFilters;
+  templateSrv.getAdhocFilters = function getAdhocFiltersScenePatch(dsName) {
+    var _a;
+    if (allActiveFilterSets.size === 0) {
+      return originalGetAdhocFilters.call(templateSrv);
     }
-    let urlValue = null;
-    let value = this._sceneObject.state.value;
-    if (Array.isArray(value)) {
-      urlValue = value.map(String);
-    } else if (this._sceneObject.state.isMulti) {
-      urlValue = [String(value)];
-    } else {
-      urlValue = String(value);
+    const ds = runtime.getDataSourceSrv().getInstanceSettings(dsName);
+    if (!ds) {
+      return [];
     }
-    return { [this.getKey()]: urlValue };
-  }
-  updateFromUrl(values) {
-    let urlValue = values[this.getKey()];
-    if (urlValue != null) {
-      if (this._sceneObject.state.includeAll) {
-        urlValue = handleLegacyUrlAllValue(urlValue);
-      }
-      if (this._sceneObject.state.allValue && this._sceneObject.state.allValue === urlValue) {
-        urlValue = ALL_VARIABLE_VALUE;
-      }
-      if (!this._sceneObject.isActive) {
-        this._sceneObject.skipNextValidation = true;
+    for (const filter of allActiveFilterSets.values()) {
+      if (((_a = filter.state.datasource) == null ? void 0 : _a.uid) === ds.uid) {
+        return filter.state.filters;
       }
-      this._sceneObject.changeValueTo(urlValue);
     }
-  }
+    return [];
+  }.bind(templateSrv);
 }
-function handleLegacyUrlAllValue(value) {
-  if (lodash.isArray(value) && value[0] === ALL_VARIABLE_TEXT) {
-    return [ALL_VARIABLE_VALUE];
-  } else if (value === ALL_VARIABLE_TEXT) {
-    return ALL_VARIABLE_VALUE;
+function findActiveAdHocFilterVariableByUid(dsUid) {
+  var _a;
+  for (const filter of allActiveFilterSets.values()) {
+    if (((_a = filter.state.datasource) == null ? void 0 : _a.uid) === dsUid) {
+      return filter;
+    }
   }
-  return value;
+  return void 0;
 }
-class CustomAllValue {
-  constructor(_value, _variable) {
-    this._value = _value;
-    this._variable = _variable;
-  }
-  formatter(formatNameOrFn) {
-    if (formatNameOrFn === schema.VariableFormatID.Text) {
-      return ALL_VARIABLE_TEXT;
-    }
-    if (formatNameOrFn === schema.VariableFormatID.PercentEncode) {
-      return formatRegistry.get(schema.VariableFormatID.PercentEncode).formatter(this._value, [], this._variable);
+
+function registerQueryWithController(entry) {
+  return (queryStream) => {
+    const queryControler = sceneGraph.getQueryController(entry.origin);
+    if (!queryControler) {
+      return queryStream;
     }
-    if (formatNameOrFn === schema.VariableFormatID.QueryParam) {
-      return formatRegistry.get(schema.VariableFormatID.QueryParam).formatter(ALL_VARIABLE_TEXT, [], this._variable);
+    return new rxjs.Observable((observer) => {
+      if (!entry.cancel) {
+        entry.cancel = () => observer.complete();
+      }
+      queryControler.queryStarted(entry);
+      let markedAsCompleted = false;
+      const sub = queryStream.subscribe({
+        next: (v) => {
+          if (!markedAsCompleted && v.state !== schema.LoadingState.Loading) {
+            markedAsCompleted = true;
+            queryControler.queryCompleted(entry);
+          }
+          observer.next(v);
+        },
+        error: (e) => observer.error(e),
+        complete: () => {
+          observer.complete();
+        }
+      });
+      return () => {
+        sub.unsubscribe();
+        if (!markedAsCompleted) {
+          queryControler.queryCompleted(entry);
+        }
+      };
+    });
+  };
+}
+
+const allActiveGroupByVariables = /* @__PURE__ */ new Set();
+function findActiveGroupByVariablesByUid(dsUid) {
+  var _a;
+  for (const groupByVariable of allActiveGroupByVariables.values()) {
+    if (((_a = groupByVariable.state.datasource) == null ? void 0 : _a.uid) === dsUid) {
+      return groupByVariable;
     }
-    return this._value;
   }
+  return void 0;
 }
 
 function getOptionSearcher(options, includeAll) {
@@ -10377,6 +10381,7 @@ const getSceneGridRowStyles = (theme) => {
       cursor: "pointer",
       background: "transparent",
       border: "none",
+      minWidth: 0,
       gap: theme.spacing(1)
     }),
     rowCollapsed: css.css({
@@ -10384,7 +10389,13 @@ const getSceneGridRowStyles = (theme) => {
     }),
     rowTitle: css.css({
       fontSize: theme.typography.h5.fontSize,
-      fontWeight: theme.typography.fontWeightMedium
+      fontWeight: theme.typography.fontWeightMedium,
+      whiteSpace: "nowrap",
+      overflow: "hidden",
+      textOverflow: "ellipsis",
+      maxWidth: "100%",
+      flexGrow: 1,
+      minWidth: 0
     }),
     collapsedInfo: css.css({
       fontSize: theme.typography.bodySmall.fontSize,
@@ -10395,6 +10406,7 @@ const getSceneGridRowStyles = (theme) => {
     }),
     rowTitleAndActionsGroup: css.css({
       display: "flex",
+      minWidth: 0,
       "&:hover, &:focus-within": {
         "& > div": {
           opacity: 1
@@ -10403,6 +10415,7 @@ const getSceneGridRowStyles = (theme) => {
     }),
     rowActions: css.css({
       display: "flex",
+      whiteSpace: "nowrap",
       opacity: 0,
       transition: "200ms opacity ease-in 200ms",
       "&:hover, &:focus-within": {
@@ -10421,6 +10434,7 @@ const getSceneGridRowStyles = (theme) => {
       }
     }),
     panelCount: css.css({
+      whiteSpace: "nowrap",
       paddingLeft: theme.spacing(2),
       color: theme.colors.text.secondary,
       fontStyle: "italic",