@grafana/scenes 6.47.0--canary.1236.19342683681.0 → 6.47.0--canary.1302.19359467581.0

package/dist/index.js

@@ -1774,7 +1774,7 @@ function isRepeatCloneOrChildOf(scene) {
   return false;
 }
 
-const _MultiValueVariable = class _MultiValueVariable extends SceneObjectBase {
+class MultiValueVariable extends SceneObjectBase {
   constructor() {
     super(...arguments);
     this._urlSync = new MultiValueUrlSyncHandler(this);
@@ -1865,7 +1865,7 @@ const _MultiValueVariable = class _MultiValueVariable extends SceneObjectBase {
     } else {
       const defaultState = this.getDefaultSingleState(options);
       stateUpdate.value = defaultState.value;
-      stateUpdate.text = defaultState.label;
+      stateUpdate.text = defaultState.text;
     }
     return stateUpdate;
   }
@@ -1887,35 +1887,16 @@ const _MultiValueVariable = class _MultiValueVariable extends SceneObjectBase {
       if (this.state.allValue) {
         return new CustomAllValue(this.state.allValue, this);
       }
-      value = this.state.options.map((o) => o.value);
+      value = this.state.options.map((x) => x.value);
     }
-    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);
+    if (fieldPath != null && Array.isArray(value)) {
+      const index = parseInt(fieldPath, 10);
+      if (!isNaN(index) && index >= 0 && index < value.length) {
+        return value[index];
       }
     }
     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;
@@ -1933,18 +1914,18 @@ const _MultiValueVariable = 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], properties: [options[0].properties] };
+      return { value: [options[0].value], text: [options[0].label] };
     } else {
       return { value: [], text: [] };
     }
   }
   getDefaultSingleState(options) {
     if (this.state.defaultToAll) {
-      return { value: ALL_VARIABLE_VALUE, label: ALL_VARIABLE_TEXT };
+      return { value: ALL_VARIABLE_VALUE, text: ALL_VARIABLE_TEXT };
     } else if (options.length > 0) {
-      return { value: options[0].value, label: options[0].label, properties: options[0].properties };
+      return { value: options[0].value, text: options[0].label };
     } else {
-      return { value: "", label: "" };
+      return { value: "", text: "" };
     }
   }
   /**
@@ -2029,17 +2010,15 @@ const _MultiValueVariable = class _MultiValueVariable extends SceneObjectBase {
       this.updateValueGivenNewOptions(options);
     });
   }
-};
-_MultiValueVariable.fieldAccessorCache = {};
-let MultiValueVariable = _MultiValueVariable;
+}
 function findOptionMatchingCurrent(currentValue, currentText, options) {
   let textMatch;
-  for (const o of options) {
-    if (o.value === currentValue) {
-      return o;
+  for (const item of options) {
+    if (item.value === currentValue) {
+      return item;
     }
-    if (o.label === currentText) {
-      textMatch = o;
+    if (item.label === currentText) {
+      textMatch = item;
     }
   }
   return textMatch;
@@ -4143,7 +4122,7 @@ function VizPanelRenderer({ model }) {
       height,
       selectionId: model.state.key,
       displayMode,
-      titleItems: titleItemsElement,
+      titleItems: titleItemsElement.length > 0 ? titleItemsElement : void 0,
       dragClass,
       actions: actionsElement,
       dragClassCancel,
@@ -9455,7 +9434,7 @@ function metricNamesToVariableValues(variableRegEx, sort, metricNames) {
         value = firstMatch[1];
       }
     }
-    options.push({ label: text, value, properties: item.properties });
+    options.push({ label: text, value });
   }
   options = lodash.uniqBy(options, "value");
   return sortVariableValues(options, sort);
@@ -9529,7 +9508,7 @@ function sortByNaturalSort(options) {
   });
 }
 
-function toMetricFindValues(valueProp, textProp) {
+function toMetricFindValues() {
   return (source) => source.pipe(
     rxjs.map((panelData) => {
       const frames = panelData.series;
@@ -9542,81 +9521,58 @@ function toMetricFindValues(valueProp, textProp) {
       if (frames[0].fields.length === 0) {
         return [];
       }
-      const indices = findFieldsIndices(frames);
-      if (indices.value === -1 && indices.text === -1 && !indices.properties.length) {
-        throw new Error("Couldn't find any field of type string in the results");
-      }
-      if (indices.value === -1 && indices.text === -1 && indices.properties.length === 1) {
-        indices.value = indices.properties[0].index;
-        indices.properties = [];
+      const processedDataFrames = data.getProcessedDataFrames(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 (indices.value === -1 && indices.text === -1 && indices.properties.length && true && true) {
-        throw new Error("Properties found in series but missing valueProp and textProp");
+      if (stringIndex === -1) {
+        throw new Error("Couldn't find any field of type string in the results.");
       }
-      const metrics = [];
       for (const frame of frames) {
         for (let index = 0; index < frame.length; index++) {
-          const value = indices.value !== -1 ? frame.fields[indices.value].values.get(index) : "";
-          const text = indices.text !== -1 ? frame.fields[indices.text].values.get(index) : "";
-          const expandable = indices.expandable !== -1 ? frame.fields[indices.expandable].values.get(index) : void 0;
-          if (!indices.properties.length) {
-            metrics.push({
-              value: value || text,
-              text: text || value,
-              expandable
-            });
+          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 });
             continue;
           }
-          const properties = indices.properties.reduce((acc, p) => {
-            acc[p.name] = frame.fields[p.index].values.get(index);
-            return acc;
-          }, {});
-          metrics.push({
-            value: value || valueProp || text || textProp,
-            text: text || textProp || value || valueProp,
-            properties,
-            expandable
-          });
+          if (valueIndex === -1 && textIndex !== -1) {
+            metrics.push({ text, value: text, expandable });
+            continue;
+          }
+          if (valueIndex !== -1 && textIndex === -1) {
+            metrics.push({ text: value, value, expandable });
+            continue;
+          }
+          metrics.push({ text, value, expandable });
         }
       }
       return metrics;
     })
   );
 }
-function findFieldsIndices(frames) {
-  const indices = {
-    value: -1,
-    text: -1,
-    properties: [],
-    expandable: -1
-  };
-  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 areMetricFindValues(data$1) {
   if (!data$1) {
     return false;
@@ -10020,7 +9976,7 @@ const sceneGraph = {
   getScopes
 };
 
-const _LocalValueVariable = class _LocalValueVariable extends SceneObjectBase {
+class LocalValueVariable extends SceneObjectBase {
   constructor(initialState) {
     super({
       type: "system",
@@ -10031,19 +9987,9 @@ const _LocalValueVariable = class _LocalValueVariable extends SceneObjectBase {
       skipUrlSync: true
     });
   }
-  getValue(fieldPath) {
-    if (fieldPath != null && this.state.properties) {
-      return this.getFieldAccessor(fieldPath)(this.state.properties);
-    }
+  getValue() {
     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();
   }
@@ -10064,9 +10010,7 @@ const _LocalValueVariable = class _LocalValueVariable extends SceneObjectBase {
     }
     return false;
   }
-};
-_LocalValueVariable.fieldAccessorCache = {};
-let LocalValueVariable = _LocalValueVariable;
+}
 
 const PATH_ID_SEPARATOR = "$";
 function buildPathIdFor(panel) {
@@ -11863,7 +11807,6 @@ class CustomVariable extends MultiValueVariable {
     super({
       type: "custom",
       query: "",
-      valuesFormat: "csv",
       value: "",
       text: "",
       options: [],
@@ -11892,27 +11835,8 @@ 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.state.valuesFormat === "json" ? this.transformJsonToOptions(this.state.query) : this.transformCsvStringToOptions(this.state.query);
+    const options = this.transformCsvStringToOptions(this.state.query);
     if (!options.length) {
       this.skipNextValidation = true;
     }