@grafana/scenes 4.11.2--canary.690.8734061653.0 → 4.11.2--canary.687.8737546972.0

package/dist/index.js

@@ -2840,79 +2840,6 @@ class CustomAllValue {
   }
 }
 
-function VariableValueSelect({ model }) {
-  const { value, key } = model.useState();
-  const onInputChange = model.onSearchChange ? (value2, meta) => {
-    if (meta.action === "input-change") {
-      model.onSearchChange(value2);
-    }
-  } : void 0;
-  return /* @__PURE__ */ React__default["default"].createElement(ui.Select, {
-    id: key,
-    placeholder: "Select value",
-    width: "auto",
-    value,
-    allowCustomValue: true,
-    virtualized: true,
-    tabSelectsValue: false,
-    onInputChange,
-    options: model.getOptionsForSelect(),
-    onChange: (newValue) => {
-      model.changeValueTo(newValue.value, newValue.label);
-    }
-  });
-}
-function VariableValueSelectMulti({ model }) {
-  const { value, key, maxVisibleValues, noValueOnClear } = model.useState();
-  const arrayValue = React.useMemo(() => lodash.isArray(value) ? value : [value], [value]);
-  const options = model.getOptionsForSelect();
-  const [uncommittedValue, setUncommittedValue] = React.useState(arrayValue);
-  React.useEffect(() => {
-    setUncommittedValue(arrayValue);
-  }, [arrayValue]);
-  const onInputChange = model.onSearchChange ? (value2, meta) => {
-    if (meta.action === "input-change") {
-      model.onSearchChange(value2);
-    }
-  } : void 0;
-  const placeholder = options.length > 0 ? "Select value" : "";
-  return /* @__PURE__ */ React__default["default"].createElement(ui.MultiSelect, {
-    id: key,
-    placeholder,
-    width: "auto",
-    value: uncommittedValue,
-    noMultiValueWrap: true,
-    maxVisibleValues: maxVisibleValues != null ? maxVisibleValues : 5,
-    tabSelectsValue: false,
-    virtualized: true,
-    allowCustomValue: true,
-    options: model.getOptionsForSelect(),
-    closeMenuOnSelect: false,
-    isClearable: true,
-    onInputChange,
-    onBlur: () => {
-      model.changeValueTo(uncommittedValue);
-    },
-    onChange: (newValue, action) => {
-      if (action.action === "clear" && noValueOnClear) {
-        model.changeValueTo([]);
-      }
-      setUncommittedValue(newValue.map((x) => x.value));
-    }
-  });
-}
-function renderSelectForVariable(model) {
-  if (model.state.isMulti) {
-    return /* @__PURE__ */ React__default["default"].createElement(VariableValueSelectMulti, {
-      model
-    });
-  } else {
-    return /* @__PURE__ */ React__default["default"].createElement(VariableValueSelect, {
-      model
-    });
-  }
-}
-
 var __defProp$z = Object.defineProperty;
 var __defProps$n = Object.defineProperties;
 var __getOwnPropDescs$n = Object.getOwnPropertyDescriptors;
@@ -2948,6 +2875,7 @@ class GroupByVariable extends MultiValueVariable {
     }, initialState), {
       noValueOnClear: true
     }));
+    this.isLazy = true;
     this._getKeys = async (ds) => {
       var _a, _b, _c;
       const override = await ((_b = (_a = this.state).getTagKeysProvider) == null ? void 0 : _b.call(_a, this, null));
@@ -3033,7 +2961,56 @@ class GroupByVariable extends MultiValueVariable {
 }
 GroupByVariable.Component = GroupByVariableRenderer;
 function GroupByVariableRenderer({ model }) {
-  return renderSelectForVariable(model);
+  const { value, key, maxVisibleValues, noValueOnClear } = model.useState();
+  const arrayValue = React.useMemo(() => lodash.isArray(value) ? value : [value], [value]);
+  const [isFetchingOptions, setIsFetchingOptions] = React.useState(false);
+  const [isOptionsOpen, setIsOptionsOpen] = React.useState(false);
+  const [uncommittedValue, setUncommittedValue] = React.useState(arrayValue);
+  React.useEffect(() => {
+    setUncommittedValue(arrayValue);
+  }, [arrayValue]);
+  const onInputChange = model.onSearchChange ? (value2, meta) => {
+    if (meta.action === "input-change") {
+      model.onSearchChange(value2);
+    }
+  } : void 0;
+  const placeholder = "Select value";
+  return /* @__PURE__ */ React__default["default"].createElement(ui.MultiSelect, {
+    "data-testid": `GroupBySelect-${key}`,
+    id: key,
+    placeholder,
+    width: "auto",
+    value: uncommittedValue,
+    noMultiValueWrap: true,
+    maxVisibleValues: maxVisibleValues != null ? maxVisibleValues : 5,
+    tabSelectsValue: false,
+    virtualized: true,
+    allowCustomValue: true,
+    options: model.getOptionsForSelect(),
+    closeMenuOnSelect: false,
+    isOpen: isOptionsOpen,
+    isClearable: true,
+    isLoading: isFetchingOptions,
+    onInputChange,
+    onBlur: () => {
+      model.changeValueTo(uncommittedValue);
+    },
+    onChange: (newValue, action) => {
+      if (action.action === "clear" && noValueOnClear) {
+        model.changeValueTo([]);
+      }
+      setUncommittedValue(newValue.map((x) => x.value));
+    },
+    onOpenMenu: async () => {
+      setIsFetchingOptions(true);
+      await rxjs.lastValueFrom(model.validateAndUpdate());
+      setIsFetchingOptions(false);
+      setIsOptionsOpen(true);
+    },
+    onCloseMenu: () => {
+      setIsOptionsOpen(false);
+    }
+  });
 }
 
 function LoadingIndicator(props) {
@@ -3168,18 +3145,24 @@ var __spreadValues$y = (a, b) => {
   return a;
 };
 var __spreadProps$m = (a, b) => __defProps$m(a, __getOwnPropDescs$m(b));
-function keyLabelToOption(key, label) {
-  return key !== "" ? {
-    value: key,
-    label: label || key
-  } : null;
-}
 function AdHocFilterRenderer({ filter, model }) {
   var _a, _b;
   const styles = ui.useStyles2(getStyles$7);
   const [state, setState] = React.useState({});
-  const keyValue = keyLabelToOption(filter.key, filter.keyLabel);
-  const valueValue = keyLabelToOption(filter.value, filter.valueLabel);
+  const keyValue = React.useMemo(() => {
+    if (filter.key !== "") {
+      if (model.state.defaultKeys) {
+        const matchingDefaultKey = model.state.defaultKeys.find((option) => option.value === filter.key);
+        if (matchingDefaultKey) {
+          return toSelectableValue(matchingDefaultKey);
+        }
+      } else {
+        return data.toOption(filter.key);
+      }
+    }
+    return null;
+  }, [filter.key, model.state.defaultKeys]);
+  const valueValue = filter.value !== "" ? data.toOption(filter.value) : null;
   const valueSelect = /* @__PURE__ */ React__default["default"].createElement(ui.Select, {
     allowCustomValue: true,
     formatCreateLabel: (inputValue) => `Use custom value: ${inputValue}`,
@@ -3189,7 +3172,7 @@ function AdHocFilterRenderer({ filter, model }) {
     value: valueValue,
     placeholder: "Select value",
     options: state.values,
-    onChange: (v) => model._updateFilter(filter, "value", v),
+    onChange: (v) => model._updateFilter(filter, "value", v.value),
     isOpen: state.isValuesOpen,
     isLoading: state.isValuesLoading,
     autoFocus: filter.key !== "" && filter.value === "",
@@ -3211,7 +3194,7 @@ function AdHocFilterRenderer({ filter, model }) {
     value: keyValue,
     placeholder: "Select label",
     options: state.keys,
-    onChange: (v) => model._updateFilter(filter, "key", v),
+    onChange: (v) => model._updateFilter(filter, "key", v.value),
     autoFocus: filter.key === "",
     isOpen: state.isKeysOpen,
     isLoading: state.isKeysLoading,
@@ -3258,7 +3241,7 @@ function AdHocFilterRenderer({ filter, model }) {
     disabled: model.state.readOnly,
     options: model._getOperators(),
     width: "auto",
-    onChange: (v) => model._updateFilter(filter, "operator", v)
+    onChange: (v) => model._updateFilter(filter, "operator", v.value)
   }), valueSelect, /* @__PURE__ */ React__default["default"].createElement(ui.Button, {
     variant: "secondary",
     "aria-label": "Remove filter",
@@ -3345,7 +3328,7 @@ class AdHocFiltersVariableUrlSyncHandler {
     if (filters.length === 0) {
       return { [this.getKey()]: [""] };
     }
-    const value = filters.map((filter) => toArray(filter).map(escapePipeDelimiters).join("|"));
+    const value = filters.map((filter) => toArray(filter).map(escapeDelimiter).join("|"));
     return { [this.getKey()]: value };
   }
   updateFromUrl(values) {
@@ -3365,54 +3348,30 @@ function deserializeUrlToFilters(value) {
   const filter = toFilter(value);
   return filter === null ? [] : [filter];
 }
-function escapePipeDelimiters(value) {
+function escapeDelimiter(value) {
   if (value === null || value === void 0) {
     return "";
   }
-  return value = /\|/g[Symbol.replace](value, "__gfp__");
+  return /\|/g[Symbol.replace](value, "__gfp__");
 }
-function escapeCommaDelimiters(value) {
+function unescapeDelimiter(value) {
   if (value === null || value === void 0) {
     return "";
   }
-  return /,/g[Symbol.replace](value, "__gfc__");
-}
-function unescapeDelimiters(value) {
-  if (value === null || value === void 0) {
-    return "";
-  }
-  value = /__gfp__/g[Symbol.replace](value, "|");
-  value = /__gfc__/g[Symbol.replace](value, ",");
-  return value;
+  return /__gfp__/g[Symbol.replace](value, "|");
 }
 function toArray(filter) {
-  return [
-    toCommaDelimitedString(filter.key, filter.keyLabel),
-    filter.operator,
-    toCommaDelimitedString(filter.value, filter.valueLabel)
-  ];
-}
-function toCommaDelimitedString(key, label) {
-  if (!label || key === label) {
-    return escapeCommaDelimiters(key);
-  }
-  return [key, label].map(escapeCommaDelimiters).join(",");
+  return [filter.key, filter.operator, filter.value];
 }
-function toFilter(urlValue) {
-  if (typeof urlValue !== "string" || urlValue.length === 0) {
+function toFilter(value) {
+  if (typeof value !== "string" || value.length === 0) {
     return null;
   }
-  const [key, keyLabel, operator, _operatorLabel, value, valueLabel] = urlValue.split("|").reduce((acc, v) => {
-    const [key2, label] = v.split(",");
-    acc.push(key2, label != null ? label : key2);
-    return acc;
-  }, []).map(unescapeDelimiters);
+  const parts = value.split("|").map(unescapeDelimiter);
   return {
-    key,
-    keyLabel,
-    operator,
-    value,
-    valueLabel,
+    key: parts[0],
+    operator: parts[1],
+    value: parts[2],
     condition: ""
   };
 }
@@ -3471,23 +3430,22 @@ class AdHocFiltersVariable extends SceneObjectBase {
   getValue() {
     return this.state.filterExpression;
   }
-  _updateFilter(filter, prop, { value, label }) {
+  _updateFilter(filter, prop, value) {
     if (value == null) {
       return;
     }
     const { filters, _wip } = this.state;
-    const propLabelKey = `${prop}Label`;
     if (filter === _wip) {
       if (prop === "value") {
-        this.setState({ filters: [...filters, __spreadProps$l(__spreadValues$x({}, _wip), { [prop]: value, [propLabelKey]: label })], _wip: void 0 });
+        this.setState({ filters: [...filters, __spreadProps$l(__spreadValues$x({}, _wip), { [prop]: value })], _wip: void 0 });
       } else {
-        this.setState({ _wip: __spreadProps$l(__spreadValues$x({}, filter), { [prop]: value, [propLabelKey]: label }) });
+        this.setState({ _wip: __spreadProps$l(__spreadValues$x({}, filter), { [prop]: value }) });
       }
       return;
     }
     const updatedFilters = this.state.filters.map((f) => {
       if (f === filter) {
-        return __spreadProps$l(__spreadValues$x({}, f), { [prop]: value, [propLabelKey]: label });
+        return __spreadProps$l(__spreadValues$x({}, f), { [prop]: value });
       }
       return f;
     });
@@ -3546,9 +3504,7 @@ class AdHocFiltersVariable extends SceneObjectBase {
     return values.map(toSelectableValue);
   }
   _addWip() {
-    this.setState({
-      _wip: { key: "", keyLabel: "", value: "", valueLabel: "", operator: "=", condition: "" }
-    });
+    this.setState({ _wip: { key: "", value: "", operator: "=", condition: "" } });
   }
   _getOperators() {
     return ["=", "!=", "<", ">", "=~", "!~"].map((value) => ({
@@ -4070,9 +4026,9 @@ function escapeLokiRegexp(value) {
 function getQueriesForVariables(sourceObject) {
   const runners = sceneGraph.findAllObjects(
     sourceObject.getRoot(),
-    (o) => o instanceof SceneQueryRunner && o.isActive
+    (o) => o instanceof SceneQueryRunner
   );
-  const applicableRunners = runners.filter((r) => {
+  const applicableRunners = filterOutInactiveRunnerDuplicates(runners).filter((r) => {
     var _a, _b;
     return ((_a = r.state.datasource) == null ? void 0 : _a.uid) === ((_b = sourceObject.state.datasource) == null ? void 0 : _b.uid);
   });
@@ -4085,6 +4041,24 @@ function getQueriesForVariables(sourceObject) {
   });
   return result;
 }
+function filterOutInactiveRunnerDuplicates(runners) {
+  const groupedItems = {};
+  for (const item of runners) {
+    if (item.state.key) {
+      if (!(item.state.key in groupedItems)) {
+        groupedItems[item.state.key] = [];
+      }
+      groupedItems[item.state.key].push(item);
+    }
+  }
+  return Object.values(groupedItems).flatMap((group) => {
+    const activeItems = group.filter((item) => item.isActive);
+    if (activeItems.length === 0 && group.length === 1) {
+      return group;
+    }
+    return activeItems;
+  });
+}
 
 function isAdHocVariable(variable) {
   return variable.state.type === "adhoc";
@@ -6156,6 +6130,9 @@ class SceneVariableSet extends SceneObjectBase {
     }
   }
   _variableNeedsUpdate(variable) {
+    if (variable.isLazy) {
+      return false;
+    }
     if (!variable.validateAndUpdate) {
       return false;
     }
@@ -6333,6 +6310,79 @@ class ConstantVariable extends SceneObjectBase {
   }
 }
 
+function VariableValueSelect({ model }) {
+  const { value, key } = model.useState();
+  const onInputChange = model.onSearchChange ? (value2, meta) => {
+    if (meta.action === "input-change") {
+      model.onSearchChange(value2);
+    }
+  } : void 0;
+  return /* @__PURE__ */ React__default["default"].createElement(ui.Select, {
+    id: key,
+    placeholder: "Select value",
+    width: "auto",
+    value,
+    allowCustomValue: true,
+    virtualized: true,
+    tabSelectsValue: false,
+    onInputChange,
+    options: model.getOptionsForSelect(),
+    onChange: (newValue) => {
+      model.changeValueTo(newValue.value, newValue.label);
+    }
+  });
+}
+function VariableValueSelectMulti({ model }) {
+  const { value, key, maxVisibleValues, noValueOnClear } = model.useState();
+  const arrayValue = React.useMemo(() => lodash.isArray(value) ? value : [value], [value]);
+  const options = model.getOptionsForSelect();
+  const [uncommittedValue, setUncommittedValue] = React.useState(arrayValue);
+  React.useEffect(() => {
+    setUncommittedValue(arrayValue);
+  }, [arrayValue]);
+  const onInputChange = model.onSearchChange ? (value2, meta) => {
+    if (meta.action === "input-change") {
+      model.onSearchChange(value2);
+    }
+  } : void 0;
+  const placeholder = options.length > 0 ? "Select value" : "";
+  return /* @__PURE__ */ React__default["default"].createElement(ui.MultiSelect, {
+    id: key,
+    placeholder,
+    width: "auto",
+    value: uncommittedValue,
+    noMultiValueWrap: true,
+    maxVisibleValues: maxVisibleValues != null ? maxVisibleValues : 5,
+    tabSelectsValue: false,
+    virtualized: true,
+    allowCustomValue: true,
+    options: model.getOptionsForSelect(),
+    closeMenuOnSelect: false,
+    isClearable: true,
+    onInputChange,
+    onBlur: () => {
+      model.changeValueTo(uncommittedValue);
+    },
+    onChange: (newValue, action) => {
+      if (action.action === "clear" && noValueOnClear) {
+        model.changeValueTo([]);
+      }
+      setUncommittedValue(newValue.map((x) => x.value));
+    }
+  });
+}
+function renderSelectForVariable(model) {
+  if (model.state.isMulti) {
+    return /* @__PURE__ */ React__default["default"].createElement(VariableValueSelectMulti, {
+      model
+    });
+  } else {
+    return /* @__PURE__ */ React__default["default"].createElement(VariableValueSelect, {
+      model
+    });
+  }
+}
+
 var __defProp$i = Object.defineProperty;
 var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
 var __hasOwnProp$i = Object.prototype.hasOwnProperty;
@@ -7007,7 +7057,7 @@ var __spreadValues$e = (a, b) => {
   return a;
 };
 class TestVariable extends MultiValueVariable {
-  constructor(initialState) {
+  constructor(initialState, isLazy = false) {
     super(__spreadValues$e({
       type: "custom",
       name: "Test",
@@ -7020,9 +7070,11 @@ class TestVariable extends MultiValueVariable {
     this.completeUpdate = new rxjs.Subject();
     this.isGettingValues = true;
     this.getValueOptionsCount = 0;
+    this.isLazy = false;
     this._variableDependency = new VariableDependencyConfig(this, {
       statePaths: ["query"]
     });
+    this.isLazy = isLazy;
   }
   getValueOptions(args) {
     const { delayMs } = this.state;