@grafana/scenes 4.25.0--canary.753.9269482662.0 → 4.25.0--canary.758.9288152473.0

package/dist/index.js

@@ -1532,27 +1532,6 @@ function findObjectInternal(scene, check, alreadySearchedChild, shouldSearchUp)
   }
   return null;
 }
-function findByKey(sceneObject, key) {
-  const found = findObject(sceneObject, (sceneToCheck) => {
-    return sceneToCheck.state.key === key;
-  });
-  if (!found) {
-    throw new Error("Unable to find scene with key " + key);
-  }
-  return found;
-}
-function findByKeyAndType(sceneObject, key, targetType) {
-  const found = findObject(sceneObject, (sceneToCheck) => {
-    return sceneToCheck.state.key === key;
-  });
-  if (!found) {
-    throw new Error("Unable to find scene with key " + key);
-  }
-  if (!(found instanceof targetType)) {
-    throw new Error(`Found scene object with key ${key} does not match type ${targetType.name}`);
-  }
-  return found;
-}
 function findObject(scene, check) {
   return findObjectInternal(scene, check, void 0, true);
 }
@@ -2043,8 +2022,6 @@ const sceneGraph = {
   interpolate,
   lookupVariable,
   hasVariableDependencyInLoadingState,
-  findByKey,
-  findByKeyAndType,
   findObject,
   findAllObjects,
   getAncestor,
@@ -2682,6 +2659,14 @@ class MultiValueVariable extends SceneObjectBase {
   }
   updateValueGivenNewOptions(options) {
     const { value: currentValue, text: currentText } = this.state;
+    const stateUpdate = this.getStateUpdateGivenNewOptions(options, currentValue, currentText);
+    this.interceptStateUpdateAfterValidation(stateUpdate);
+    this.setStateHelper(stateUpdate);
+    if (stateUpdate.value !== currentValue || stateUpdate.text !== currentText || this.hasAllValue()) {
+      this.publishEvent(new SceneVariableValueChangedEvent(this), true);
+    }
+  }
+  getStateUpdateGivenNewOptions(options, currentValue, currentText) {
     const stateUpdate = {
       options,
       loading: false,
@@ -2699,7 +2684,20 @@ class MultiValueVariable extends SceneObjectBase {
         stateUpdate.value = "";
         stateUpdate.text = "";
       }
-    } else if (this.hasAllValue()) ; else if (this.state.isMulti) {
+      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);
@@ -2715,26 +2713,22 @@ class MultiValueVariable extends SceneObjectBase {
           stateUpdate.text = validTexts;
         }
       }
+      return stateUpdate;
+    }
+    let matchingOption = findOptionMatchingCurrent(currentValue, currentText, options);
+    if (matchingOption) {
+      stateUpdate.text = matchingOption.label;
+      stateUpdate.value = matchingOption.value;
     } else {
-      let matchingOption = findOptionMatchingCurrent(currentValue, currentText, options);
-      if (matchingOption) {
-        stateUpdate.text = matchingOption.label;
-        stateUpdate.value = matchingOption.value;
+      if (this.state.defaultToAll) {
+        stateUpdate.value = ALL_VARIABLE_VALUE;
+        stateUpdate.text = ALL_VARIABLE_TEXT;
       } 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;
-        }
+        stateUpdate.value = options[0].value;
+        stateUpdate.text = options[0].label;
       }
     }
-    this.interceptStateUpdateAfterValidation(stateUpdate);
-    this.setStateHelper(stateUpdate);
-    if (stateUpdate.value !== currentValue || stateUpdate.text !== currentText || this.hasAllValue()) {
-      this.publishEvent(new SceneVariableValueChangedEvent(this), true);
-    }
+    return stateUpdate;
   }
   interceptStateUpdateAfterValidation(stateUpdate) {
     const isAllValueFix = stateUpdate.value === ALL_VARIABLE_VALUE && this.state.text === ALL_VARIABLE_TEXT;
@@ -3800,7 +3794,7 @@ class AdHocFiltersVariable extends SceneObjectBase {
     var _a, _b, _c;
     const override = await ((_b = (_a = this.state).getTagValuesProvider) == null ? void 0 : _b.call(_a, this, filter));
     if (override && override.replace) {
-      return override.values.map(toSelectableValue);
+      return handleOptionGroups(override.values);
     }
     const ds = await this._dataSourceSrv.get(this.state.datasource, this._scopedVars);
     if (!ds || !ds.getTagValues) {
@@ -3813,7 +3807,7 @@ class AdHocFiltersVariable extends SceneObjectBase {
     if (override) {
       values = values.concat(override.values);
     }
-    return values.map(toSelectableValue);
+    return handleOptionGroups(values);
   }
   _addWip() {
     this.setState({
@@ -3869,6 +3863,27 @@ function toSelectableValue({ text, value }) {
 function isFilterComplete(filter) {
   return filter.key !== "" && filter.operator !== "" && filter.value !== "";
 }
+function handleOptionGroups(values) {
+  const result = [];
+  const groupedResults = /* @__PURE__ */ new Map();
+  for (const value of values) {
+    const groupLabel = value.group;
+    if (groupLabel) {
+      let group = groupedResults.get(groupLabel);
+      if (!group) {
+        group = [];
+        groupedResults.set(groupLabel, group);
+      }
+      group.push(toSelectableValue(value));
+    } else {
+      result.push(toSelectableValue(value));
+    }
+  }
+  for (const [group, values2] of groupedResults) {
+    result.unshift({ label: group, options: values2 });
+  }
+  return result;
+}
 
 class DataLayersMerger {
   constructor() {