@grafana/scenes 6.47.1--canary.1303.19499670138.0 → 6.48.0--canary.1236.19576619727.0

package/dist/index.js

@@ -1774,7 +1774,7 @@ function isRepeatCloneOrChildOf(scene) {
   return false;
 }
 
-class MultiValueVariable extends SceneObjectBase {
+const _MultiValueVariable = class _MultiValueVariable extends SceneObjectBase {
   constructor() {
     super(...arguments);
     this._urlSync = new MultiValueUrlSyncHandler(this);
@@ -1865,7 +1865,7 @@ class MultiValueVariable extends SceneObjectBase {
     } else {
       const defaultState = this.getDefaultSingleState(options);
       stateUpdate.value = defaultState.value;
-      stateUpdate.text = defaultState.text;
+      stateUpdate.text = defaultState.label;
     }
     return stateUpdate;
   }
@@ -1887,16 +1887,35 @@ class MultiValueVariable extends SceneObjectBase {
       if (this.state.allValue) {
         return new CustomAllValue(this.state.allValue, this);
       }
-      value = this.state.options.map((x) => x.value);
+      value = this.state.options.map((o) => o.value);
     }
-    if (fieldPath != null && Array.isArray(value)) {
-      const index = parseInt(fieldPath, 10);
-      if (!isNaN(index) && index >= 0 && index < value.length) {
-        return value[index];
+    if (fieldPath != null) {
+      if (Array.isArray(value)) {
+        const index = parseInt(fieldPath, 10);
+        if (!isNaN(index) && index >= 0 && index < value.length) {
+          return value[index];
+        }
+        const accesor2 = this.getFieldAccessor(fieldPath);
+        return value.map((v) => {
+          const o2 = this.state.options.find((o3) => o3.value === v);
+          return o2 ? accesor2(o2.properties) : v;
+        });
+      }
+      const accesor = this.getFieldAccessor(fieldPath);
+      const o = this.state.options.find((o2) => o2.value === value);
+      if (o) {
+        return accesor(o.properties);
       }
     }
     return value;
   }
+  getFieldAccessor(fieldPath) {
+    const accessor = _MultiValueVariable.fieldAccessorCache[fieldPath];
+    if (accessor) {
+      return accessor;
+    }
+    return _MultiValueVariable.fieldAccessorCache[fieldPath] = lodash.property(fieldPath);
+  }
   getValueText() {
     if (this.hasAllValue()) {
       return ALL_VARIABLE_TEXT;
@@ -1914,18 +1933,18 @@ class MultiValueVariable extends SceneObjectBase {
     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] };
+      return { value: [options[0].value], text: [options[0].label], properties: [options[0].properties] };
     } else {
       return { value: [], text: [] };
     }
   }
   getDefaultSingleState(options) {
     if (this.state.defaultToAll) {
-      return { value: ALL_VARIABLE_VALUE, text: ALL_VARIABLE_TEXT };
+      return { value: ALL_VARIABLE_VALUE, label: ALL_VARIABLE_TEXT };
     } else if (options.length > 0) {
-      return { value: options[0].value, text: options[0].label };
+      return { value: options[0].value, label: options[0].label, properties: options[0].properties };
     } else {
-      return { value: "", text: "" };
+      return { value: "", label: "" };
     }
   }
   /**
@@ -2010,15 +2029,17 @@ class MultiValueVariable extends SceneObjectBase {
       this.updateValueGivenNewOptions(options);
     });
   }
-}
+};
+_MultiValueVariable.fieldAccessorCache = {};
+let MultiValueVariable = _MultiValueVariable;
 function findOptionMatchingCurrent(currentValue, currentText, options) {
   let textMatch;
-  for (const item of options) {
-    if (item.value === currentValue) {
-      return item;
+  for (const o of options) {
+    if (o.value === currentValue) {
+      return o;
     }
-    if (item.label === currentText) {
-      textMatch = item;
+    if (o.label === currentText) {
+      textMatch = o;
     }
   }
   return textMatch;
@@ -9439,7 +9460,7 @@ function metricNamesToVariableValues(variableRegEx, sort, metricNames) {
         value = firstMatch[1];
       }
     }
-    options.push({ label: text, value });
+    options.push({ label: text, value, properties: item.properties });
   }
   options = lodash.uniqBy(options, "value");
   return sortVariableValues(options, sort);
@@ -9513,7 +9534,7 @@ function sortByNaturalSort(options) {
   });
 }
 
-function toMetricFindValues() {
+function toMetricFindValues(valueProp, textProp) {
   return (source) => source.pipe(
     rxjs.map((panelData) => {
       const frames = panelData.series;
@@ -9526,58 +9547,86 @@ function toMetricFindValues() {
       if (frames[0].fields.length === 0) {
         return [];
       }
-      const processedDataFrames = data.getProcessedDataFrames(frames);
+      const indices = validateIndices(findFieldsIndices(frames));
       const metrics = [];
-      let valueIndex = -1;
-      let textIndex = -1;
-      let stringIndex = -1;
-      let expandableIndex = -1;
-      for (const frame of processedDataFrames) {
-        for (let index = 0; index < frame.fields.length; index++) {
-          const field = frame.fields[index];
-          const fieldName = data.getFieldDisplayName(field, frame, frames).toLowerCase();
-          if (field.type === data.FieldType.string && stringIndex === -1) {
-            stringIndex = index;
-          }
-          if (fieldName === "text" && field.type === data.FieldType.string && textIndex === -1) {
-            textIndex = index;
-          }
-          if (fieldName === "value" && field.type === data.FieldType.string && valueIndex === -1) {
-            valueIndex = index;
-          }
-          if (fieldName === "expandable" && (field.type === data.FieldType.boolean || field.type === data.FieldType.number) && expandableIndex === -1) {
-            expandableIndex = index;
-          }
-        }
-      }
-      if (stringIndex === -1) {
-        throw new Error("Couldn't find any field of type string in the results.");
-      }
       for (const frame of frames) {
         for (let index = 0; index < frame.length; index++) {
-          const expandable = expandableIndex !== -1 ? frame.fields[expandableIndex].values.get(index) : void 0;
-          const string = frame.fields[stringIndex].values.get(index);
-          const text = textIndex !== -1 ? frame.fields[textIndex].values.get(index) : "";
-          const value = valueIndex !== -1 ? frame.fields[valueIndex].values.get(index) : "";
-          if (valueIndex === -1 && textIndex === -1) {
-            metrics.push({ text: string, value: string, expandable });
+          const fieldValue = (fieldIndex) => fieldIndex !== -1 ? frame.fields[fieldIndex].values.get(index) : void 0;
+          const value = fieldValue(indices.value);
+          const text = fieldValue(indices.text);
+          const expandable = fieldValue(indices.expandable);
+          if (!indices.properties.length) {
+            metrics.push({
+              value: value || text,
+              text: text || value,
+              expandable
+            });
             continue;
           }
-          if (valueIndex === -1 && textIndex !== -1) {
-            metrics.push({ text, value: text, expandable });
-            continue;
+          const properties = {};
+          for (const p of indices.properties) {
+            properties[p.name] = fieldValue(p.index);
           }
-          if (valueIndex !== -1 && textIndex === -1) {
-            metrics.push({ text: value, value, expandable });
-            continue;
-          }
-          metrics.push({ text, value, expandable });
+          metrics.push({
+            value: value || valueProp || text || textProp,
+            text: text || textProp || value || valueProp,
+            properties,
+            expandable
+          });
         }
       }
       return metrics;
     })
   );
 }
+function findFieldsIndices(frames) {
+  const indices = {
+    value: -1,
+    text: -1,
+    expandable: -1,
+    properties: []
+  };
+  for (const frame of data.getProcessedDataFrames(frames)) {
+    for (let index = 0; index < frame.fields.length; index++) {
+      const field = frame.fields[index];
+      const fieldName = data.getFieldDisplayName(field, frame, frames).toLowerCase();
+      if (field.type === data.FieldType.string) {
+        if (fieldName === "value") {
+          if (indices.value === -1) {
+            indices.value = index;
+          }
+          continue;
+        }
+        if (fieldName === "text") {
+          if (indices.text === -1) {
+            indices.text = index;
+          }
+          continue;
+        }
+        indices.properties.push({ name: fieldName, index });
+        continue;
+      }
+      if (fieldName === "expandable" && (field.type === data.FieldType.boolean || field.type === data.FieldType.number) && indices.expandable === -1) {
+        indices.expandable = index;
+      }
+    }
+  }
+  return indices;
+}
+function validateIndices(indices, valueProp, textProp) {
+  const hasNoValueOrText = indices.value === -1 && indices.text === -1;
+  if (hasNoValueOrText && !indices.properties.length) {
+    throw new Error("Couldn't find any field of type string in the results");
+  }
+  if (hasNoValueOrText && indices.properties.length === 1) {
+    indices.value = indices.properties[0].index;
+    indices.properties = [];
+  }
+  if (hasNoValueOrText && indices.properties.length && true && true) {
+    throw new Error("Properties found in series but missing valueProp and textProp");
+  }
+  return indices;
+}
 function areMetricFindValues(data$1) {
   if (!data$1) {
     return false;
@@ -9981,7 +10030,7 @@ const sceneGraph = {
   getScopes
 };
 
-class LocalValueVariable extends SceneObjectBase {
+const _LocalValueVariable = class _LocalValueVariable extends SceneObjectBase {
   constructor(initialState) {
     super({
       type: "system",
@@ -9992,9 +10041,19 @@ class LocalValueVariable extends SceneObjectBase {
       skipUrlSync: true
     });
   }
-  getValue() {
+  getValue(fieldPath) {
+    if (fieldPath != null && this.state.properties) {
+      return this.getFieldAccessor(fieldPath)(this.state.properties);
+    }
     return this.state.value;
   }
+  getFieldAccessor(fieldPath) {
+    const accessor = _LocalValueVariable.fieldAccessorCache[fieldPath];
+    if (accessor) {
+      return accessor;
+    }
+    return _LocalValueVariable.fieldAccessorCache[fieldPath] = lodash.property(fieldPath);
+  }
   getValueText() {
     return this.state.text.toString();
   }
@@ -10015,7 +10074,9 @@ class LocalValueVariable extends SceneObjectBase {
     }
     return false;
   }
-}
+};
+_LocalValueVariable.fieldAccessorCache = {};
+let LocalValueVariable = _LocalValueVariable;
 
 const PATH_ID_SEPARATOR = "$";
 function buildPathIdFor(panel) {
@@ -11812,6 +11873,7 @@ class CustomVariable extends MultiValueVariable {
     super({
       type: "custom",
       query: "",
+      valuesFormat: "csv",
       value: "",
       text: "",
       options: [],
@@ -11840,8 +11902,27 @@ class CustomVariable extends MultiValueVariable {
       }
     });
   }
+  transformJsonToOptions(json) {
+    if (!json) {
+      return [];
+    }
+    const parsedOptions = JSON.parse(json);
+    if (!Array.isArray(parsedOptions) || parsedOptions.some((o) => typeof o !== "object" || o === null)) {
+      throw new Error("Query must be a JSON array of objects");
+    }
+    const textProp = "text";
+    const valueProp = "value";
+    return parsedOptions.map((o) => {
+      var _a;
+      return {
+        label: (_a = String(o[textProp] || o[valueProp])) == null ? void 0 : _a.trim(),
+        value: String(o[valueProp]).trim(),
+        properties: lodash.omit(o, [textProp, valueProp])
+      };
+    });
+  }
   getValueOptions(args) {
-    const options = this.transformCsvStringToOptions(this.state.query);
+    const options = this.state.valuesFormat === "json" ? this.transformJsonToOptions(this.state.query) : this.transformCsvStringToOptions(this.state.query);
     if (!options.length) {
       this.skipNextValidation = true;
     }