@grafana/scenes 4.12.0--canary.702.8784241126.0 → 4.12.0--canary.702.8784570009.0

package/dist/index.js

@@ -3145,24 +3145,18 @@ var __spreadValues$y = (a, b) => {
   return a;
 };
 var __spreadProps$m = (a, b) => __defProps$m(a, __getOwnPropDescs$m(b));
+function keyLabelToOption(key, label) {
+  return key !== "" ? {
+    value: key,
+    label: label || key
+  } : null;
+}
 function AdHocFilterRenderer({ filter, model }) {
   var _a, _b;
   const styles = ui.useStyles2(getStyles$7);
   const [state, setState] = React.useState({});
-  const keyValue = React.useMemo(() => {
-    if (filter.key !== "") {
-      if (model.state.defaultKeys) {
-        const matchingDefaultKey = model.state.defaultKeys.find((option) => option.value === filter.key);
-        if (matchingDefaultKey) {
-          return toSelectableValue(matchingDefaultKey);
-        }
-      } else {
-        return data.toOption(filter.key);
-      }
-    }
-    return null;
-  }, [filter.key, model.state.defaultKeys]);
-  const valueValue = filter.value !== "" ? data.toOption(filter.value) : null;
+  const keyValue = keyLabelToOption(filter.key, filter.keyLabel);
+  const valueValue = keyLabelToOption(filter.value, filter.valueLabel);
   const valueSelect = /* @__PURE__ */ React__default["default"].createElement(ui.Select, {
     allowCustomValue: true,
     formatCreateLabel: (inputValue) => `Use custom value: ${inputValue}`,
@@ -3172,7 +3166,7 @@ function AdHocFilterRenderer({ filter, model }) {
     value: valueValue,
     placeholder: "Select value",
     options: state.values,
-    onChange: (v) => model._updateFilter(filter, "value", v.value),
+    onChange: (v) => model._updateFilter(filter, "value", v),
     isOpen: state.isValuesOpen,
     isLoading: state.isValuesLoading,
     autoFocus: filter.key !== "" && filter.value === "",
@@ -3194,7 +3188,7 @@ function AdHocFilterRenderer({ filter, model }) {
     value: keyValue,
     placeholder: "Select label",
     options: state.keys,
-    onChange: (v) => model._updateFilter(filter, "key", v.value),
+    onChange: (v) => model._updateFilter(filter, "key", v),
     autoFocus: filter.key === "",
     isOpen: state.isKeysOpen,
     isLoading: state.isKeysLoading,
@@ -3241,7 +3235,7 @@ function AdHocFilterRenderer({ filter, model }) {
     disabled: model.state.readOnly,
     options: model._getOperators(),
     width: "auto",
-    onChange: (v) => model._updateFilter(filter, "operator", v.value)
+    onChange: (v) => model._updateFilter(filter, "operator", v)
   }), valueSelect, /* @__PURE__ */ React__default["default"].createElement(ui.Button, {
     variant: "secondary",
     "aria-label": "Remove filter",
@@ -3328,7 +3322,7 @@ class AdHocFiltersVariableUrlSyncHandler {
     if (filters.length === 0) {
       return { [this.getKey()]: [""] };
     }
-    const value = filters.map((filter) => toArray(filter).map(escapeDelimiter).join("|"));
+    const value = filters.map((filter) => toArray(filter).map(escapePipeDelimiters).join("|"));
     return { [this.getKey()]: value };
   }
   updateFromUrl(values) {
@@ -3348,30 +3342,54 @@ function deserializeUrlToFilters(value) {
   const filter = toFilter(value);
   return filter === null ? [] : [filter];
 }
-function escapeDelimiter(value) {
+function escapePipeDelimiters(value) {
   if (value === null || value === void 0) {
     return "";
   }
-  return /\|/g[Symbol.replace](value, "__gfp__");
+  return value = /\|/g[Symbol.replace](value, "__gfp__");
 }
-function unescapeDelimiter(value) {
+function escapeCommaDelimiters(value) {
   if (value === null || value === void 0) {
     return "";
   }
-  return /__gfp__/g[Symbol.replace](value, "|");
+  return /,/g[Symbol.replace](value, "__gfc__");
+}
+function unescapeDelimiters(value) {
+  if (value === null || value === void 0) {
+    return "";
+  }
+  value = /__gfp__/g[Symbol.replace](value, "|");
+  value = /__gfc__/g[Symbol.replace](value, ",");
+  return value;
 }
 function toArray(filter) {
-  return [filter.key, filter.operator, filter.value];
+  return [
+    toCommaDelimitedString(filter.key, filter.keyLabel),
+    filter.operator,
+    toCommaDelimitedString(filter.value, filter.valueLabel)
+  ];
+}
+function toCommaDelimitedString(key, label) {
+  if (!label || key === label) {
+    return escapeCommaDelimiters(key);
+  }
+  return [key, label].map(escapeCommaDelimiters).join(",");
 }
-function toFilter(value) {
-  if (typeof value !== "string" || value.length === 0) {
+function toFilter(urlValue) {
+  if (typeof urlValue !== "string" || urlValue.length === 0) {
     return null;
   }
-  const parts = value.split("|").map(unescapeDelimiter);
+  const [key, keyLabel, operator, _operatorLabel, value, valueLabel] = urlValue.split("|").reduce((acc, v) => {
+    const [key2, label] = v.split(",");
+    acc.push(key2, label != null ? label : key2);
+    return acc;
+  }, []).map(unescapeDelimiters);
   return {
-    key: parts[0],
-    operator: parts[1],
-    value: parts[2],
+    key,
+    keyLabel,
+    operator,
+    value,
+    valueLabel,
     condition: ""
   };
 }
@@ -3430,22 +3448,23 @@ class AdHocFiltersVariable extends SceneObjectBase {
   getValue() {
     return this.state.filterExpression;
   }
-  _updateFilter(filter, prop, value) {
+  _updateFilter(filter, prop, { value, label }) {
     if (value == null) {
       return;
     }
     const { filters, _wip } = this.state;
+    const propLabelKey = `${prop}Label`;
     if (filter === _wip) {
       if (prop === "value") {
-        this.setState({ filters: [...filters, __spreadProps$l(__spreadValues$x({}, _wip), { [prop]: value })], _wip: void 0 });
+        this.setState({ filters: [...filters, __spreadProps$l(__spreadValues$x({}, _wip), { [prop]: value, [propLabelKey]: label })], _wip: void 0 });
       } else {
-        this.setState({ _wip: __spreadProps$l(__spreadValues$x({}, filter), { [prop]: value }) });
+        this.setState({ _wip: __spreadProps$l(__spreadValues$x({}, filter), { [prop]: value, [propLabelKey]: label }) });
       }
       return;
     }
     const updatedFilters = this.state.filters.map((f) => {
       if (f === filter) {
-        return __spreadProps$l(__spreadValues$x({}, f), { [prop]: value });
+        return __spreadProps$l(__spreadValues$x({}, f), { [prop]: value, [propLabelKey]: label });
       }
       return f;
     });
@@ -3504,7 +3523,9 @@ class AdHocFiltersVariable extends SceneObjectBase {
     return values.map(toSelectableValue);
   }
   _addWip() {
-    this.setState({ _wip: { key: "", value: "", operator: "=", condition: "" } });
+    this.setState({
+      _wip: { key: "", keyLabel: "", value: "", valueLabel: "", operator: "=", condition: "" }
+    });
   }
   _getOperators() {
     return ["=", "!=", "<", ">", "=~", "!~"].map((value) => ({
@@ -4747,7 +4768,7 @@ class VizPanel extends SceneObjectBase {
     this._onInstanceStateChange = (state) => {
       if (this._panelContext) {
         this._panelContext = __spreadProps$g(__spreadValues$s({}, this._panelContext), {
-          instanceState: this.state._pluginInstanceState
+          instanceState: __spreadValues$s(__spreadValues$s({}, this._panelContext.instanceState), state)
         });
       }
       this.setState({ _pluginInstanceState: state });