@grafana/scenes 6.45.0 → 6.47.0--canary.1236.19298426344.0

package/dist/esm/variables/variants/query/toMetricFindValues.js

@@ -1,7 +1,7 @@
-import { getProcessedDataFrames, getFieldDisplayName, FieldType, isDataFrame } from '@grafana/data';
+import { isDataFrame, getProcessedDataFrames, getFieldDisplayName, FieldType } from '@grafana/data';
 import { map } from 'rxjs';
 
-function toMetricFindValues() {
+function toMetricFindValues(valueProp, textProp) {
   return (source) => source.pipe(
     map((panelData) => {
       const frames = panelData.series;
@@ -14,58 +14,81 @@ function toMetricFindValues() {
       if (frames[0].fields.length === 0) {
         return [];
       }
-      const processedDataFrames = 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 = getFieldDisplayName(field, frame, frames).toLowerCase();
-          if (field.type === FieldType.string && stringIndex === -1) {
-            stringIndex = index;
-          }
-          if (fieldName === "text" && field.type === FieldType.string && textIndex === -1) {
-            textIndex = index;
-          }
-          if (fieldName === "value" && field.type === FieldType.string && valueIndex === -1) {
-            valueIndex = index;
-          }
-          if (fieldName === "expandable" && (field.type === FieldType.boolean || field.type === FieldType.number) && expandableIndex === -1) {
-            expandableIndex = index;
-          }
-        }
+      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 (stringIndex === -1) {
-        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 = [];
       }
+      if (indices.value === -1 && indices.text === -1 && indices.properties.length && true && true) {
+        throw new Error("Properties found in series but missing valueProp and textProp");
+      }
+      const metrics = [];
       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 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
+            });
             continue;
           }
-          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 });
+          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
+          });
         }
       }
       return metrics;
     })
   );
 }
+function findFieldsIndices(frames) {
+  const indices = {
+    value: -1,
+    text: -1,
+    properties: [],
+    expandable: -1
+  };
+  for (const frame of getProcessedDataFrames(frames)) {
+    for (let index = 0; index < frame.fields.length; index++) {
+      const field = frame.fields[index];
+      const fieldName = getFieldDisplayName(field, frame, frames).toLowerCase();
+      if (field.type === 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 === FieldType.boolean || field.type === FieldType.number) && indices.expandable === -1) {
+        indices.expandable = index;
+      }
+    }
+  }
+  return indices;
+}
 function areMetricFindValues(data) {
   if (!data) {
     return false;

package/dist/esm/variables/variants/query/toMetricFindValues.js.map

@@ -1 +1 @@
-{"version":3,"file":"toMetricFindValues.js","sources":["../../../../../src/variables/variants/query/toMetricFindValues.ts"],"sourcesContent":["import {\n  FieldType,\n  getFieldDisplayName,\n  isDataFrame,\n  MetricFindValue,\n  PanelData,\n  getProcessedDataFrames,\n} from '@grafana/data';\nimport { map, OperatorFunction } from 'rxjs';\n\nexport function toMetricFindValues(): OperatorFunction<PanelData, MetricFindValue[]> {\n  return (source) =>\n    source.pipe(\n      map((panelData) => {\n        const frames = panelData.series;\n        if (!frames || !frames.length) {\n          return [];\n        }\n\n        if (areMetricFindValues(frames)) {\n          return frames;\n        }\n\n        if (frames[0].fields.length === 0) {\n          return [];\n        }\n\n        const processedDataFrames = getProcessedDataFrames(frames);\n        const metrics: MetricFindValue[] = [];\n\n        let valueIndex = -1;\n        let textIndex = -1;\n        let stringIndex = -1;\n        let expandableIndex = -1;\n\n        for (const frame of processedDataFrames) {\n          for (let index = 0; index < frame.fields.length; index++) {\n            const field = frame.fields[index];\n            const fieldName = getFieldDisplayName(field, frame, frames).toLowerCase();\n\n            if (field.type === FieldType.string && stringIndex === -1) {\n              stringIndex = index;\n            }\n\n            if (fieldName === 'text' && field.type === FieldType.string && textIndex === -1) {\n              textIndex = index;\n            }\n\n            if (fieldName === 'value' && field.type === FieldType.string && valueIndex === -1) {\n              valueIndex = index;\n            }\n\n            if (\n              fieldName === 'expandable' &&\n              (field.type === FieldType.boolean || field.type === FieldType.number) &&\n              expandableIndex === -1\n            ) {\n              expandableIndex = index;\n            }\n          }\n        }\n\n        if (stringIndex === -1) {\n          throw new Error(\"Couldn't find any field of type string in the results.\");\n        }\n\n        for (const frame of frames) {\n          for (let index = 0; index < frame.length; index++) {\n            const expandable = expandableIndex !== -1 ? frame.fields[expandableIndex].values.get(index) : undefined;\n            const string = frame.fields[stringIndex].values.get(index);\n            const text = textIndex !== -1 ? frame.fields[textIndex].values.get(index) : '';\n            const value = valueIndex !== -1 ? frame.fields[valueIndex].values.get(index) : '';\n\n            if (valueIndex === -1 && textIndex === -1) {\n              metrics.push({ text: string, value: string, expandable });\n              continue;\n            }\n\n            if (valueIndex === -1 && textIndex !== -1) {\n              metrics.push({ text, value: text, expandable });\n              continue;\n            }\n\n            if (valueIndex !== -1 && textIndex === -1) {\n              metrics.push({ text: value, value, expandable });\n              continue;\n            }\n\n            metrics.push({ text, value, expandable });\n          }\n        }\n\n        return metrics;\n      })\n    );\n}\n\nfunction areMetricFindValues(data: any[]): data is MetricFindValue[] {\n  if (!data) {\n    return false;\n  }\n\n  if (!data.length) {\n    return true;\n  }\n\n  const firstValue: any = data[0];\n\n  if (isDataFrame(firstValue)) {\n    return false;\n  }\n\n  for (const firstValueKey in firstValue) {\n    if (!firstValue.hasOwnProperty(firstValueKey)) {\n      continue;\n    }\n\n    if (\n      firstValue[firstValueKey] !== null &&\n      typeof firstValue[firstValueKey] !== 'string' &&\n      typeof firstValue[firstValueKey] !== 'number'\n    ) {\n      continue;\n    }\n\n    const key = firstValueKey.toLowerCase();\n\n    if (key === 'text' || key === 'value') {\n      return true;\n    }\n  }\n\n  return false;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"toMetricFindValues.js","sources":["../../../../../src/variables/variants/query/toMetricFindValues.ts"],"sourcesContent":["import {\n  DataFrame,\n  FieldType,\n  getFieldDisplayName,\n  getProcessedDataFrames,\n  isDataFrame,\n  MetricFindValue,\n  PanelData,\n} from '@grafana/data';\nimport { map, OperatorFunction } from 'rxjs';\n\ninterface MetricFindValueWithOptionalProperties extends MetricFindValue {\n  properties?: Record<string, any>;\n}\n\nexport function toMetricFindValues(\n  valueProp?: string,\n  textProp?: string\n): OperatorFunction<PanelData, MetricFindValueWithOptionalProperties[]> {\n  return (source) =>\n    source.pipe(\n      map((panelData) => {\n        const frames = panelData.series;\n        if (!frames || !frames.length) {\n          return [];\n        }\n\n        if (areMetricFindValues(frames)) {\n          return frames;\n        }\n\n        if (frames[0].fields.length === 0) {\n          return [];\n        }\n\n        const indices = findFieldsIndices(frames);\n\n        if (indices.value === -1 && indices.text === -1 && !indices.properties.length) {\n          throw new Error(\"Couldn't find any field of type string in the results\");\n        }\n\n        // a single field of type string that is neither named \"value\" nor \"text\" is considered as \"value\"\n        if (indices.value === -1 && indices.text === -1 && indices.properties.length === 1) {\n          indices.value = indices.properties[0].index;\n          indices.properties = [];\n        }\n\n        if (indices.value === -1 && indices.text === -1 && indices.properties.length && !valueProp && !textProp) {\n          throw new Error('Properties found in series but missing valueProp and textProp');\n        }\n\n        const metrics: MetricFindValueWithOptionalProperties[] = [];\n\n        for (const frame of frames) {\n          for (let index = 0; index < frame.length; index++) {\n            const value = indices.value !== -1 ? frame.fields[indices.value].values.get(index) : '';\n            const text = indices.text !== -1 ? frame.fields[indices.text].values.get(index) : '';\n            const expandable =\n              indices.expandable !== -1 ? frame.fields[indices.expandable].values.get(index) : undefined;\n\n            if (!indices.properties.length) {\n              metrics.push({\n                value: value || text,\n                text: text || value,\n                expandable,\n              });\n              continue;\n            }\n\n            const properties = indices.properties.reduce((acc, p) => {\n              acc[p.name] = frame.fields[p.index].values.get(index);\n              return acc;\n            }, {} as Record<string, string>);\n\n            metrics.push({\n              value:\n                value ||\n                (valueProp && properties[valueProp as string]) ||\n                text ||\n                (textProp && properties[textProp as string]),\n              text:\n                text ||\n                (textProp && properties[textProp as string]) ||\n                value ||\n                (valueProp && properties[valueProp as string]),\n              properties,\n              expandable,\n            });\n          }\n        }\n\n        return metrics;\n      })\n    );\n}\n\ntype Indices = {\n  value: number;\n  text: number;\n  properties: Array<{ name: string; index: number }>;\n  expandable: number;\n};\n\nfunction findFieldsIndices(frames: DataFrame[]): Indices {\n  const indices: Indices = {\n    value: -1,\n    text: -1,\n    properties: [],\n    expandable: -1,\n  };\n\n  for (const frame of getProcessedDataFrames(frames)) {\n    for (let index = 0; index < frame.fields.length; index++) {\n      const field = frame.fields[index];\n      const fieldName = getFieldDisplayName(field, frame, frames).toLowerCase();\n\n      if (field.type === FieldType.string) {\n        if (fieldName === 'value') {\n          if (indices.value === -1) {\n            indices.value = index;\n          }\n          continue;\n        }\n\n        if (fieldName === 'text') {\n          if (indices.text === -1) {\n            indices.text = index;\n          }\n          continue;\n        }\n\n        indices.properties.push({ name: fieldName, index });\n        continue;\n      }\n\n      if (\n        fieldName === 'expandable' &&\n        (field.type === FieldType.boolean || field.type === FieldType.number) &&\n        indices.expandable === -1\n      ) {\n        indices.expandable = index;\n      }\n    }\n  }\n\n  return indices;\n}\n\nfunction areMetricFindValues(data: any[]): data is MetricFindValue[] {\n  if (!data) {\n    return false;\n  }\n\n  if (!data.length) {\n    return true;\n  }\n\n  const firstValue: any = data[0];\n\n  if (isDataFrame(firstValue)) {\n    return false;\n  }\n\n  for (const firstValueKey in firstValue) {\n    if (!firstValue.hasOwnProperty(firstValueKey)) {\n      continue;\n    }\n\n    if (\n      firstValue[firstValueKey] !== null &&\n      typeof firstValue[firstValueKey] !== 'string' &&\n      typeof firstValue[firstValueKey] !== 'number'\n    ) {\n      continue;\n    }\n\n    const key = firstValueKey.toLowerCase();\n\n    if (key === 'text' || key === 'value') {\n      return true;\n    }\n  }\n\n  return false;\n}\n"],"names":[],"mappings":"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"}

package/dist/esm/variables/variants/query/utils.js

@@ -41,7 +41,7 @@ function metricNamesToVariableValues(variableRegEx, sort, metricNames) {
         value = firstMatch[1];
       }
     }
-    options.push({ label: text, value });
+    options.push({ label: text, value, properties: item.properties });
   }
   options = uniqBy(options, "value");
   return sortVariableValues(options, sort);

package/dist/esm/variables/variants/query/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sources":["../../../../../src/variables/variants/query/utils.ts"],"sourcesContent":["import { isNumber, sortBy, toLower, uniqBy } from 'lodash';\n\nimport { stringToJsRegex, VariableSort } from '@grafana/data';\n\nimport { VariableValueOption } from '../../types';\n\nexport function metricNamesToVariableValues(variableRegEx: string, sort: VariableSort, metricNames: any[]) {\n  let regex;\n  let options: VariableValueOption[] = [];\n\n  if (variableRegEx) {\n    regex = stringToJsRegex(variableRegEx);\n  }\n\n  for (let i = 0; i < metricNames.length; i++) {\n    const item = metricNames[i];\n    let text = item.text ?? item.value ?? '';\n    let value = item.value ?? item.text ?? '';\n\n    if (isNumber(value)) {\n      value = value.toString();\n    }\n\n    if (isNumber(text)) {\n      text = text.toString();\n    }\n\n    if (regex) {\n      const matches = getAllMatches(value, regex);\n      if (!matches.length) {\n        continue;\n      }\n\n      const valueGroup = matches.find((m) => m.groups && m.groups.value);\n      const textGroup = matches.find((m) => m.groups && m.groups.text);\n      const firstMatch = matches.find((m) => m.length > 1);\n      const manyMatches = matches.length > 1 && firstMatch;\n\n      if (valueGroup || textGroup) {\n        value = valueGroup?.groups?.value ?? textGroup?.groups?.text;\n        text = textGroup?.groups?.text ?? valueGroup?.groups?.value;\n      } else if (manyMatches) {\n        for (let j = 0; j < matches.length; j++) {\n          const match = matches[j];\n          options.push({ label: match[1], value: match[1] });\n        }\n        continue;\n      } else if (firstMatch) {\n        text = firstMatch[1];\n        value = firstMatch[1];\n      }\n    }\n\n    options.push({ label: text, value: value });\n  }\n\n  options = uniqBy(options, 'value');\n  return sortVariableValues(options, sort);\n}\n\nconst getAllMatches = (str: string, regex: RegExp): RegExpExecArray[] => {\n  const results: RegExpExecArray[] = [];\n  let matches = null;\n\n  regex.lastIndex = 0;\n\n  do {\n    matches = regex.exec(str);\n    if (matches) {\n      results.push(matches);\n    }\n  } while (regex.global && matches && matches[0] !== '' && matches[0] !== undefined);\n\n  return results;\n};\n\nexport const sortVariableValues = (options: VariableValueOption[], sortOrder: VariableSort) => {\n  if (sortOrder === VariableSort.disabled) {\n    return options;\n  }\n\n  switch (sortOrder) {\n    case VariableSort.alphabeticalAsc:\n      options = sortBy(options, 'label');\n      break;\n    case VariableSort.alphabeticalDesc:\n      options = sortBy(options, 'label').reverse();\n      break;\n    case VariableSort.numericalAsc:\n      options = sortBy(options, sortByNumeric);\n      break;\n    case VariableSort.numericalDesc:\n      options = sortBy(options, sortByNumeric);\n      options = options.reverse();\n      break;\n    case VariableSort.alphabeticalCaseInsensitiveAsc:\n      options = sortBy(options, (opt) => {\n        return toLower(opt.label);\n      });\n      break;\n    case VariableSort.alphabeticalCaseInsensitiveDesc:\n      options = sortBy(options, (opt) => {\n        return toLower(opt.label);\n      });\n      options = options.reverse();\n      break;\n    case VariableSort.naturalAsc || 7:\n      // Sort by natural sort\n      options = sortByNaturalSort(options);\n      break;\n    case VariableSort.naturalDesc || 8:\n      options = sortByNaturalSort(options);\n      options = options.reverse();\n      break;\n    default:\n      break;\n  }\n  return options;\n};\n\nfunction sortByNumeric(opt: VariableValueOption) {\n  if (!opt.label) {\n    return -1;\n  }\n  const matches = opt.label.match(/.*?(\\d+).*/);\n  if (!matches || matches.length < 2) {\n    return -1;\n  } else {\n    return parseInt(matches[1], 10);\n  }\n}\n\nconst collator = new Intl.Collator(undefined, { sensitivity: 'accent', numeric: true });\n\nfunction sortByNaturalSort(options: VariableValueOption[]) {\n  return options.slice().sort((a, b) => {\n    return collator.compare(a.label, b.label);\n  });\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sources":["../../../../../src/variables/variants/query/utils.ts"],"sourcesContent":["import { isNumber, sortBy, toLower, uniqBy } from 'lodash';\n\nimport { stringToJsRegex, VariableSort } from '@grafana/data';\n\nimport { VariableValueOption } from '../../types';\n\nexport function metricNamesToVariableValues(variableRegEx: string, sort: VariableSort, metricNames: any[]) {\n  let regex;\n  let options: VariableValueOption[] = [];\n\n  if (variableRegEx) {\n    regex = stringToJsRegex(variableRegEx);\n  }\n\n  for (let i = 0; i < metricNames.length; i++) {\n    const item = metricNames[i];\n    let text = item.text ?? item.value ?? '';\n    let value = item.value ?? item.text ?? '';\n\n    if (isNumber(value)) {\n      value = value.toString();\n    }\n\n    if (isNumber(text)) {\n      text = text.toString();\n    }\n\n    if (regex) {\n      const matches = getAllMatches(value, regex);\n      if (!matches.length) {\n        continue;\n      }\n\n      const valueGroup = matches.find((m) => m.groups && m.groups.value);\n      const textGroup = matches.find((m) => m.groups && m.groups.text);\n      const firstMatch = matches.find((m) => m.length > 1);\n      const manyMatches = matches.length > 1 && firstMatch;\n\n      if (valueGroup || textGroup) {\n        value = valueGroup?.groups?.value ?? textGroup?.groups?.text;\n        text = textGroup?.groups?.text ?? valueGroup?.groups?.value;\n      } else if (manyMatches) {\n        for (let j = 0; j < matches.length; j++) {\n          const match = matches[j];\n          options.push({ label: match[1], value: match[1] });\n        }\n        continue;\n      } else if (firstMatch) {\n        text = firstMatch[1];\n        value = firstMatch[1];\n      }\n    }\n\n    options.push({ label: text, value: value, properties: item.properties });\n  }\n\n  options = uniqBy(options, 'value');\n  return sortVariableValues(options, sort);\n}\n\nconst getAllMatches = (str: string, regex: RegExp): RegExpExecArray[] => {\n  const results: RegExpExecArray[] = [];\n  let matches = null;\n\n  regex.lastIndex = 0;\n\n  do {\n    matches = regex.exec(str);\n    if (matches) {\n      results.push(matches);\n    }\n  } while (regex.global && matches && matches[0] !== '' && matches[0] !== undefined);\n\n  return results;\n};\n\nexport const sortVariableValues = (options: VariableValueOption[], sortOrder: VariableSort) => {\n  if (sortOrder === VariableSort.disabled) {\n    return options;\n  }\n\n  switch (sortOrder) {\n    case VariableSort.alphabeticalAsc:\n      options = sortBy(options, 'label');\n      break;\n    case VariableSort.alphabeticalDesc:\n      options = sortBy(options, 'label').reverse();\n      break;\n    case VariableSort.numericalAsc:\n      options = sortBy(options, sortByNumeric);\n      break;\n    case VariableSort.numericalDesc:\n      options = sortBy(options, sortByNumeric);\n      options = options.reverse();\n      break;\n    case VariableSort.alphabeticalCaseInsensitiveAsc:\n      options = sortBy(options, (opt) => {\n        return toLower(opt.label);\n      });\n      break;\n    case VariableSort.alphabeticalCaseInsensitiveDesc:\n      options = sortBy(options, (opt) => {\n        return toLower(opt.label);\n      });\n      options = options.reverse();\n      break;\n    case VariableSort.naturalAsc || 7:\n      // Sort by natural sort\n      options = sortByNaturalSort(options);\n      break;\n    case VariableSort.naturalDesc || 8:\n      options = sortByNaturalSort(options);\n      options = options.reverse();\n      break;\n    default:\n      break;\n  }\n  return options;\n};\n\nfunction sortByNumeric(opt: VariableValueOption) {\n  if (!opt.label) {\n    return -1;\n  }\n  const matches = opt.label.match(/.*?(\\d+).*/);\n  if (!matches || matches.length < 2) {\n    return -1;\n  } else {\n    return parseInt(matches[1], 10);\n  }\n}\n\nconst collator = new Intl.Collator(undefined, { sensitivity: 'accent', numeric: true });\n\nfunction sortByNaturalSort(options: VariableValueOption[]) {\n  return options.slice().sort((a, b) => {\n    return collator.compare(a.label, b.label);\n  });\n}\n"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -88,10 +88,13 @@ interface CustomVariableValue {
 }
 interface ValidateAndUpdateResult {
 }
+interface VariableValueOptionProperties extends Record<string, any> {
+}
 interface VariableValueOption {
     label: string;
     value: VariableValueSingle;
     group?: string;
+    properties?: VariableValueOptionProperties;
 }
 interface SceneVariableSetState extends SceneObjectState {
     variables: SceneVariable[];
@@ -1197,6 +1200,7 @@ interface VariableGetOptionsArgs {
     searchFilter?: string;
 }
 declare abstract class MultiValueVariable<TState extends MultiValueVariableState = MultiValueVariableState> extends SceneObjectBase<TState> implements SceneVariable<TState> {
+    private static fieldAccessorCache;
     protected _urlSync: SceneObjectUrlSyncHandler;
     /**
      * Set to true to skip next value validation to maintain the current value even it it's not among the options (ie valid values)
@@ -1222,16 +1226,19 @@ declare abstract class MultiValueVariable<TState extends MultiValueVariableState
      */
     protected interceptStateUpdateAfterValidation(stateUpdate: Partial<MultiValueVariableState>): void;
     getValue(fieldPath?: string): VariableValue;
+    private getFieldAccessor;
     getValueText(): string;
     hasAllValue(): boolean;
     getDefaultMultiState(options: VariableValueOption[]): {
+        value: string[];
+        text: string[];
+        properties?: undefined;
+    } | {
         value: VariableValueSingle[];
         text: string[];
+        properties: (VariableValueOptionProperties | undefined)[];
     };
-    protected getDefaultSingleState(options: VariableValueOption[]): {
-        value: VariableValueSingle;
-        text: string;
-    };
+    protected getDefaultSingleState(options: VariableValueOption[]): VariableValueOption;
     /**
      * Change the value and publish SceneVariableValueChangedEvent event.
      */
@@ -1251,11 +1258,13 @@ declare abstract class MultiValueVariable<TState extends MultiValueVariableState
 
 interface CustomVariableState extends MultiValueVariableState {
     query: string;
+    valuesFormat?: 'csv' | 'json';
 }
 declare class CustomVariable extends MultiValueVariable<CustomVariableState> {
     protected _variableDependency: VariableDependencyConfig<CustomVariableState>;
     constructor(initialState: Partial<CustomVariableState>);
     transformCsvStringToOptions(str: string, interpolate?: boolean): VariableValueOption[];
+    private transformJsonToOptions;
     getValueOptions(args: VariableGetOptionsArgs): Observable<VariableValueOption[]>;
     static Component: ({ model }: SceneComponentProps<MultiValueVariable>) => React__default.JSX.Element;
 }
@@ -1412,8 +1421,8 @@ declare class GroupByVariable extends MultiValueVariable<GroupByVariableState> {
      * Allows clearing the value of the variable to an empty value. Overrides default behavior of a MultiValueVariable
      */
     getDefaultMultiState(options: VariableValueOption[]): {
-        value: VariableValueSingle[];
-        text: string[];
+        value: never[];
+        text: never[];
     };
 }
 declare function GroupByVariableRenderer({ model }: SceneComponentProps<GroupByVariable>): React__default.JSX.Element;
@@ -3589,4 +3598,4 @@ declare const sceneUtils: {
 };
 
 export { AdHocFiltersComboboxRenderer, AdHocFiltersVariable, AdHocFiltersVariableController, ConstantVariable, ControlsLabel, CustomVariable, DataProviderProxy, DataSourceVariable, EmbeddedScene, FieldConfigBuilder, FieldConfigBuilders, FieldConfigOverridesBuilder, GroupByVariable, IntervalVariable, LazyLoader, LocalValueVariable, MultiOrSingleValueSelect, MultiValueVariable, NestedScene, NewSceneObjectAddedEvent, PATH_ID_SEPARATOR, PanelBuilders, PanelOptionsBuilders, QueryVariable, RuntimeDataSource, SafeSerializableSceneObject, SceneApp, SceneAppPage, SceneByFrameRepeater, SceneByVariableRepeater, SceneCSSGridItem, SceneCSSGridLayout, SceneCanvasText, SceneControlsSpacer, SceneDataLayerBase, SceneDataLayerControls, SceneDataLayerSet, SceneDataLayerSetBase, SceneDataNode, SceneDataTransformer, SceneDebugger, SceneFlexItem, SceneFlexLayout, SceneGridItem, SceneGridLayout, SceneGridLayoutDragStartEvent, SceneGridRow, SceneObjectBase, SceneObjectRef, SceneObjectStateChangedEvent, SceneObjectUrlSyncConfig, SceneQueryRunner, SceneReactObject, SceneRefreshPicker, SceneTimePicker, SceneTimeRange, SceneTimeRangeCompare, SceneTimeRangeTransformerBase, SceneTimeZoneOverride, SceneToolbarButton, SceneToolbarInput, SceneVariableSet, SceneVariableValueChangedEvent, ScopesVariable, SplitLayout, SwitchVariable, TestVariable, TextBoxVariable, UrlSyncContextProvider, UrlSyncManager, UserActionEvent, VariableDependencyConfig, VariableValueControl, VariableValueSelectWrapper, VariableValueSelectors, VizConfigBuilder, VizConfigBuilders, VizPanel, VizPanelBuilder, VizPanelExploreButton, VizPanelMenu, index$2 as behaviors, index as dataLayers, escapeUrlPipeDelimiters, formatRegistry, getExploreURL, isCustomVariableValue, isDataLayer, isDataRequestEnricher, isFiltersRequestEnricher, isSceneObject, loadResources, index$1 as performanceUtils, registerQueryWithController, registerRuntimeDataSource, sceneGraph, sceneUtils, useSceneApp, useSceneObjectState, useUrlSync, writePerformanceLog };
-export type { AdHocFilterWithLabels, AdHocFiltersController, AdHocFiltersControllerState, CancelActivationHandler, ControlsLayout, CustomFormatterVariable, CustomTransformOperator, CustomTransformerDefinition, CustomVariableValue, DataLayerFilter, DataRequestEnricher, DeepPartial, EmbeddedSceneState, ExtraQueryDataProcessor, ExtraQueryDescriptor, ExtraQueryProvider, FiltersRequestEnricher, FormatVariable, InterpolationFormatParameter, MacroVariableConstructor, MultiValueVariableState, QueryRunnerState, SceneActivationHandler, SceneAppDrilldownView, SceneAppPageLike, SceneAppPageState, SceneAppRoute, SceneComponent, SceneComponentProps, SceneDataLayerProvider, SceneDataLayerProviderState, SceneDataProvider, SceneDataProviderResult, SceneDataQuery, SceneDataState, SceneDataTransformerState, SceneDeactivationHandler, SceneFlexItemLike, SceneFlexItemState, SceneGridItemLike, SceneGridItemStateLike, SceneLayout, SceneLayoutChildOptions, SceneLayoutState, SceneObject, SceneObjectState, SceneObjectStateChangedPayload, SceneObjectUrlSyncHandler, SceneObjectUrlValue, SceneObjectUrlValues, SceneObjectWithUrlSync, SceneQueryControllerEntry, SceneQueryControllerEntryType, SceneQueryControllerLike, SceneRefreshPickerState, SceneRouteMatch, SceneStateChangedHandler, SceneStatelessBehavior, SceneTimeRangeLike, SceneTimeRangeState, SceneUrlSyncOptions, SceneVariable, SceneVariableDependencyConfigLike, SceneVariableSetState, SceneVariableState, SceneVariables, UrlSyncManagerLike, UseStateHookOptions, ValidateAndUpdateResult, VariableCustomFormatterFn, VariableGetOptionsArgs, VariableValue, VariableValueOption, VariableValueSingle, VizConfig, VizPanelState };
+export type { AdHocFilterWithLabels, AdHocFiltersController, AdHocFiltersControllerState, CancelActivationHandler, ControlsLayout, CustomFormatterVariable, CustomTransformOperator, CustomTransformerDefinition, CustomVariableValue, DataLayerFilter, DataRequestEnricher, DeepPartial, EmbeddedSceneState, ExtraQueryDataProcessor, ExtraQueryDescriptor, ExtraQueryProvider, FiltersRequestEnricher, FormatVariable, InterpolationFormatParameter, MacroVariableConstructor, MultiValueVariableState, QueryRunnerState, SceneActivationHandler, SceneAppDrilldownView, SceneAppPageLike, SceneAppPageState, SceneAppRoute, SceneComponent, SceneComponentProps, SceneDataLayerProvider, SceneDataLayerProviderState, SceneDataProvider, SceneDataProviderResult, SceneDataQuery, SceneDataState, SceneDataTransformerState, SceneDeactivationHandler, SceneFlexItemLike, SceneFlexItemState, SceneGridItemLike, SceneGridItemStateLike, SceneLayout, SceneLayoutChildOptions, SceneLayoutState, SceneObject, SceneObjectState, SceneObjectStateChangedPayload, SceneObjectUrlSyncHandler, SceneObjectUrlValue, SceneObjectUrlValues, SceneObjectWithUrlSync, SceneQueryControllerEntry, SceneQueryControllerEntryType, SceneQueryControllerLike, SceneRefreshPickerState, SceneRouteMatch, SceneStateChangedHandler, SceneStatelessBehavior, SceneTimeRangeLike, SceneTimeRangeState, SceneUrlSyncOptions, SceneVariable, SceneVariableDependencyConfigLike, SceneVariableSetState, SceneVariableState, SceneVariables, UrlSyncManagerLike, UseStateHookOptions, ValidateAndUpdateResult, VariableCustomFormatterFn, VariableGetOptionsArgs, VariableValue, VariableValueOption, VariableValueOptionProperties, VariableValueSingle, VizConfig, VizPanelState };

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;
@@ -9434,7 +9455,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);
@@ -9508,7 +9529,7 @@ function sortByNaturalSort(options) {
   });
 }
 
-function toMetricFindValues() {
+function toMetricFindValues(valueProp, textProp) {
   return (source) => source.pipe(
     rxjs.map((panelData) => {
       const frames = panelData.series;
@@ -9521,58 +9542,81 @@ function toMetricFindValues() {
       if (frames[0].fields.length === 0) {
         return [];
       }
-      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;
-          }
-        }
+      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 = [];
       }
-      if (stringIndex === -1) {
-        throw new Error("Couldn't find any field of type string in the results.");
+      if (indices.value === -1 && indices.text === -1 && indices.properties.length && true && true) {
+        throw new Error("Properties found in series but missing valueProp and textProp");
       }
+      const metrics = [];
       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 });
-            continue;
-          }
-          if (valueIndex === -1 && textIndex !== -1) {
-            metrics.push({ text, value: text, expandable });
-            continue;
-          }
-          if (valueIndex !== -1 && textIndex === -1) {
-            metrics.push({ text: value, value, expandable });
+          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
+            });
             continue;
           }
-          metrics.push({ text, value, expandable });
+          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
+          });
         }
       }
       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;
@@ -11807,6 +11851,7 @@ class CustomVariable extends MultiValueVariable {
     super({
       type: "custom",
       query: "",
+      valuesFormat: "csv",
       value: "",
       text: "",
       options: [],
@@ -11835,8 +11880,30 @@ class CustomVariable extends MultiValueVariable {
       }
     });
   }
+  transformJsonToOptions(json) {
+    const parsedOptions = JSON.parse(json);
+    if (!Array.isArray(parsedOptions)) {
+      throw new Error("Query must be a JSON array");
+    }
+    if (typeof parsedOptions[0] === "string") {
+      return parsedOptions.map((value) => ({ label: value.trim(), value: value.trim() }));
+    }
+    if (typeof parsedOptions[0] !== "object" || parsedOptions[0] === null) {
+      throw new Error("Query must be a JSON array of strings or objects");
+    }
+    const valueProp = "value";
+    const textProp = "text";
+    return parsedOptions.map((o) => {
+      var _a;
+      return {
+        value: String(o[valueProp]).trim(),
+        label: (_a = String(o[textProp] || o[valueProp])) == null ? void 0 : _a.trim(),
+        properties: o
+      };
+    });
+  }
   getValueOptions(args) {
-    const options = this.transformCsvStringToOptions(this.state.query);
+    const options = this.state.valuesFormat === "csv" ? this.transformCsvStringToOptions(this.state.query) : this.transformJsonToOptions(this.state.query);
     if (!options.length) {
       this.skipNextValidation = true;
     }