@grafana/scenes 4.11.1 → 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) {
@@ -4049,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);
   });
@@ -4064,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";
@@ -6135,6 +6130,9 @@ class SceneVariableSet extends SceneObjectBase {
     }
   }
   _variableNeedsUpdate(variable) {
+    if (variable.isLazy) {
+      return false;
+    }
     if (!variable.validateAndUpdate) {
       return false;
     }
@@ -6312,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;
@@ -6986,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",
@@ -6999,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;