@grafana/scenes 6.4.0--canary.1062.13918599453.0 → 6.4.1

package/dist/index.d.ts

@@ -878,7 +878,6 @@ interface AdHocFilterWithLabels<M extends Record<string, any> = {}> extends AdHo
     hidden?: boolean;
     meta?: M;
     origin?: FilterOrigin;
-    originalValue?: string[];
 }
 type AdHocControlsLayout = ControlsLayout | 'combobox';
 declare enum FilterOrigin {
@@ -1000,7 +999,6 @@ declare class AdHocFiltersVariable extends SceneObjectBase<AdHocFiltersVariableS
         skipPublish?: boolean;
         forcePublish?: boolean;
     }): void;
-    restoreOriginalFilter(filter: AdHocFilterWithLabels): void;
     getValue(): VariableValue | undefined;
     _updateFilter(filter: AdHocFilterWithLabels, update: Partial<AdHocFilterWithLabels>): void;
     _removeFilter(filter: AdHocFilterWithLabels): void;

package/dist/index.js

@@ -3972,44 +3972,19 @@ class AdHocFiltersVariableUrlSyncHandler {
   }
   getUrlState() {
     const filters = this._variable.state.filters;
-    const baseFilters = this._variable.state.baseFilters;
-    let value = [];
-    if (filters.length === 0 && (baseFilters == null ? void 0 : baseFilters.length) === 0) {
+    if (filters.length === 0) {
       return { [this.getKey()]: [""] };
     }
-    if (filters.length) {
-      value.push(
-        ...filters.filter(isFilterComplete).filter((filter) => !filter.hidden).map((filter) => toArray(filter).map(escapeUrlPipeDelimiters).join("|"))
-      );
-    }
-    if (baseFilters == null ? void 0 : baseFilters.length) {
-      value.push(
-        ...baseFilters == null ? void 0 : baseFilters.filter(isFilterComplete).filter((filter) => !filter.hidden && filter.origin && filter.originalValue).map(
-          (filter) => {
-            var _a, _b;
-            return toArray(filter).map(escapeInjectedFilterUrlDelimiters).join("|").concat(
-              `#${(_b = (_a = filter.originalValue) == null ? void 0 : _a.map(escapeInjectedFilterUrlDelimiters).join("|")) != null ? _b : ""}#${filter.origin}`
-            );
-          }
-        )
-      );
-    }
-    return {
-      [this.getKey()]: value.length ? value : [""]
-    };
+    const value = filters.filter(isFilterComplete).filter((filter) => !filter.hidden).map((filter) => toArray(filter).map(escapeUrlPipeDelimiters).join("|"));
+    return { [this.getKey()]: value };
   }
   updateFromUrl(values) {
     const urlValue = values[this.getKey()];
     if (urlValue == null) {
       return;
     }
-    if (urlValue) {
-      const filters = deserializeUrlToFilters(urlValue);
-      this._variable.setState({
-        filters: filters.filter((f) => !f.origin),
-        baseFilters: filters.filter((f) => f.origin)
-      });
-    }
+    const filters = deserializeUrlToFilters(urlValue);
+    this._variable.setState({ filters });
   }
 }
 function deserializeUrlToFilters(value) {
@@ -4034,12 +4009,10 @@ function toArray(filter) {
   return result;
 }
 function toFilter(urlValue) {
-  var _a;
   if (typeof urlValue !== "string" || urlValue.length === 0) {
     return null;
   }
-  const [filter, originalValues, origin] = urlValue.split("#");
-  const [key, keyLabel, operator, _operatorLabel, ...values] = filter.split("|").reduce((acc, v) => {
+  const [key, keyLabel, operator, _operatorLabel, ...values] = urlValue.split("|").reduce((acc, v) => {
     const [key2, label] = v.split(",");
     acc.push(key2, label != null ? label : key2);
     return acc;
@@ -4051,14 +4024,9 @@ function toFilter(urlValue) {
     value: values[0],
     values: isMultiValueOperator(operator) ? values.filter((_, index) => index % 2 === 0) : void 0,
     valueLabels: values.filter((_, index) => index % 2 === 1),
-    condition: "",
-    origin: isFilterOrigin(origin) ? origin : void 0,
-    originalValue: originalValues && originalValues.length ? (_a = originalValues.split("|")) != null ? _a : [originalValues] : void 0
+    condition: ""
   };
 }
-function isFilterOrigin(value) {
-  return value === FilterOrigin.Scopes || value === FilterOrigin.Dashboards;
-}
 function isFilter(filter) {
   return filter !== null && typeof filter.key === "string" && typeof filter.value === "string";
 }
@@ -4720,9 +4688,6 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
               return;
             }
           }
-          if (filter == null ? void 0 : filter.origin) {
-            return;
-          }
           setInputType("operator");
           return;
         }
@@ -4909,36 +4874,25 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
     className: styles.pillWrapper
   }, (filter == null ? void 0 : filter.key) ? /* @__PURE__ */ React__default["default"].createElement("div", {
     className: css.cx(styles.basePill, styles.keyPill)
-  }, keyLabel) : null, (filter == null ? void 0 : filter.key) && (filter == null ? void 0 : filter.operator) && filterInputType !== "operator" ? /* @__PURE__ */ React__default["default"].createElement("div", __spreadValues$B({
+  }, keyLabel) : null, (filter == null ? void 0 : filter.key) && (filter == null ? void 0 : filter.operator) && filterInputType !== "operator" ? /* @__PURE__ */ React__default["default"].createElement("div", {
     id: operatorIdentifier,
-    className: css.cx(
-      styles.basePill,
-      !filter.origin && styles.operatorPill,
-      filter.origin && styles.keyPill,
-      operatorIdentifier
-    ),
+    className: css.cx(styles.basePill, styles.operatorPill, operatorIdentifier),
+    role: "button",
     "aria-label": "Edit filter operator",
-    tabIndex: filter.origin ? -1 : 0,
+    tabIndex: 0,
     onClick: (event) => {
-      if (filter.origin) {
-        handleChangeViewMode == null ? void 0 : handleChangeViewMode();
-        return;
-      }
       event.stopPropagation();
       setInputValue("");
       switchInputType("operator", setInputType, void 0, refs.domReference.current);
     },
     onKeyDown: (event) => {
-      if (filter.origin) {
-        return;
-      }
       handleShiftTabInput(event, hasMultiValueOperator);
       if (event.key === "Enter") {
         setInputValue("");
         switchInputType("operator", setInputType, void 0, refs.domReference.current);
       }
     }
-  }, !filter.origin && { role: "button" }), filter.operator) : null, /* @__PURE__ */ React__default["default"].createElement("div", {
+  }, filter.operator) : null, /* @__PURE__ */ React__default["default"].createElement("div", {
     ref: multiValuePillWrapperRef
   }), isMultiValueEdit ? filterMultiValues.map((item, i) => /* @__PURE__ */ React__default["default"].createElement(MultiValuePill, {
     key: `${item.value}-${i}`,
@@ -5185,13 +5139,13 @@ function AdHocFilterPill({ filter, model, readOnly, focusOnWipInputRef }) {
   const handleChangeViewMode = React.useCallback(
     (event, shouldFocusOnPillWrapperOverride) => {
       event == null ? void 0 : event.stopPropagation();
-      if (readOnly) {
+      if (readOnly || filter.origin) {
         return;
       }
       setShouldFocusOnPillWrapper(shouldFocusOnPillWrapperOverride != null ? shouldFocusOnPillWrapperOverride : !viewMode);
       setViewMode(!viewMode);
     },
-    [readOnly, viewMode]
+    [readOnly, viewMode, filter.origin]
   );
   React.useEffect(() => {
     var _a2;
@@ -5255,20 +5209,11 @@ function AdHocFilterPill({ filter, model, readOnly, focusOnWipInputRef }) {
       size: "md",
       className: styles.pillIcon,
       tooltip: `Remove filter with key ${keyLabel}`
-    }) : null, filter.origin && !filter.originalValue && /* @__PURE__ */ React__default["default"].createElement(ui.IconButton, {
+    }) : null, filter.origin && /* @__PURE__ */ React__default["default"].createElement(ui.IconButton, {
       name: "info-circle",
       size: "md",
       className: styles.pillIcon,
       tooltip: `This is a ${filter.origin} injected filter`
-    }), filter.origin && filter.originalValue && /* @__PURE__ */ React__default["default"].createElement(ui.IconButton, {
-      onClick: (e) => {
-        e.stopPropagation();
-        model.restoreOriginalFilter(filter);
-      },
-      name: "history",
-      size: "md",
-      className: styles.pillIcon,
-      tooltip: `Restore filter to its original value`
     }));
   }
   return /* @__PURE__ */ React__default["default"].createElement(AdHocCombobox, {
@@ -5533,17 +5478,14 @@ const OPERATORS = [
 ];
 class AdHocFiltersVariable extends SceneObjectBase {
   constructor(state) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b;
     super(__spreadValues$z({
       type: "adhoc",
       name: (_a = state.name) != null ? _a : "Filters",
       filters: [],
       datasource: null,
       applyMode: "auto",
-      filterExpression: (_e = state.filterExpression) != null ? _e : renderExpression(state.expressionBuilder, [
-        ...(_c = (_b = state.baseFilters) == null ? void 0 : _b.filter((filter) => filter.origin)) != null ? _c : [],
-        ...(_d = state.filters) != null ? _d : []
-      ])
+      filterExpression: (_b = state.filterExpression) != null ? _b : renderExpression(state.expressionBuilder, state.filters)
     }, state));
     this._scopedVars = { __sceneObject: wrapInSafeSerializableSceneObject(this) };
     this._dataSourceSrv = runtime.getDataSourceSrv();
@@ -5556,38 +5498,18 @@ class AdHocFiltersVariable extends SceneObjectBase {
         this._updateScopesFilters(scopes);
       }
       const sub = (_b = this._scopesBridge) == null ? void 0 : _b.subscribeToValue((n, _) => {
-        this._updateScopesFilters(n, true);
+        this._updateScopesFilters(n);
       });
       return () => {
         sub == null ? void 0 : sub.unsubscribe();
       };
     };
-    this._updateScopesFilters = (scopes, overwrite) => {
-      var _a;
-      const scopeInjectedFilters = [];
-      const remainingFilters = [];
-      (_a = this.state.baseFilters) == null ? void 0 : _a.forEach((filter) => {
-        if (filter.origin === "scopes" /* Scopes */) {
-          scopeInjectedFilters.push(filter);
-        } else {
-          remainingFilters.push(filter);
-        }
-      });
-      const scopeFilters = getAdHocFiltersFromScopes(scopes);
-      let finalFilters = scopeFilters;
-      if (!overwrite) {
-        const editedScopeFilters = scopeInjectedFilters.filter((filter) => {
-          var _a2;
-          return (_a2 = filter.originalValue) == null ? void 0 : _a2.length;
-        });
-        const editedScopeFilterKeys = editedScopeFilters.map((filter) => filter.key);
-        const scopeFilterKeys = scopeFilters.map((filter) => filter.key);
-        finalFilters = [
-          ...editedScopeFilters.filter((filter) => scopeFilterKeys.includes(filter.key)),
-          ...scopeFilters.filter((filter) => !editedScopeFilterKeys.includes(filter.key))
-        ];
-      }
-      const newFilters = [...remainingFilters, ...finalFilters];
+    this._updateScopesFilters = (scopes) => {
+      var _a, _b;
+      const newFilters = [
+        ...(_b = (_a = this.state.baseFilters) == null ? void 0 : _a.filter((f) => f.origin && f.origin !== "scopes" /* Scopes */)) != null ? _b : [],
+        ...getAdHocFiltersFromScopes(scopes)
+      ];
       this.setState({ baseFilters: newFilters });
     };
     if (this.state.applyMode === "auto") {
@@ -5596,15 +5518,9 @@ class AdHocFiltersVariable extends SceneObjectBase {
     this.addActivationHandler(this._activationHandler);
   }
   setState(update) {
-    var _a, _b, _c;
     let filterExpressionChanged = false;
-    if ((update.filters && update.filters !== this.state.filters || update.baseFilters && update.baseFilters !== this.state.baseFilters) && !update.filterExpression) {
-      const filters = (_a = update.filters) != null ? _a : this.state.filters;
-      const baseFilters = (_b = update.baseFilters) != null ? _b : this.state.baseFilters;
-      update.filterExpression = renderExpression(this.state.expressionBuilder, [
-        ...(_c = baseFilters == null ? void 0 : baseFilters.filter((filter) => filter.origin)) != null ? _c : [],
-        ...filters != null ? filters : []
-      ]);
+    if (update.filters && update.filters !== this.state.filters && !update.filterExpression) {
+      update.filterExpression = renderExpression(this.state.expressionBuilder, update.filters);
       filterExpressionChanged = update.filterExpression !== this.state.filterExpression;
     }
     super.setState(update);
@@ -5613,14 +5529,10 @@ class AdHocFiltersVariable extends SceneObjectBase {
     }
   }
   updateFilters(filters, options) {
-    var _a, _b;
     let filterExpressionChanged = false;
     let filterExpression = void 0;
     if (filters && filters !== this.state.filters) {
-      filterExpression = renderExpression(this.state.expressionBuilder, [
-        ...(_b = (_a = this.state.baseFilters) == null ? void 0 : _a.filter((filter) => filter.origin)) != null ? _b : [],
-        ...filters
-      ]);
+      filterExpression = renderExpression(this.state.expressionBuilder, filters);
       filterExpressionChanged = filterExpression !== this.state.filterExpression;
     }
     super.setState({
@@ -5631,40 +5543,11 @@ class AdHocFiltersVariable extends SceneObjectBase {
       this.publishEvent(new SceneVariableValueChangedEvent(this), true);
     }
   }
-  restoreOriginalFilter(filter) {
-    var _a;
-    const original = {
-      originalValue: void 0
-    };
-    if ((_a = filter.originalValue) == null ? void 0 : _a.length) {
-      original.value = filter.originalValue[0];
-      original.values = filter.originalValue;
-      original.valueLabels = filter.originalValue;
-    }
-    this._updateFilter(filter, original);
-  }
   getValue() {
     return this.state.filterExpression;
   }
   _updateFilter(filter, update) {
-    var _a;
-    const { baseFilters, filters, _wip } = this.state;
-    if (filter.origin) {
-      const currentValues = filter.values ? filter.values : [filter.value];
-      const updateValues = update.values || (update.value ? [update.value] : void 0);
-      const originalValueOverride = update.hasOwnProperty("originalValue");
-      if (!originalValueOverride && updateValues && !filter.originalValue && !lodash.isEqual(currentValues, updateValues)) {
-        update.originalValue = currentValues;
-      }
-      if (!originalValueOverride && lodash.isEqual(updateValues, filter.originalValue)) {
-        update.originalValue = void 0;
-      }
-      const updatedBaseFilters = (_a = baseFilters == null ? void 0 : baseFilters.map((f) => {
-        return f === filter ? __spreadValues$z(__spreadValues$z({}, f), update) : f;
-      })) != null ? _a : [];
-      this.setState({ baseFilters: updatedBaseFilters });
-      return;
-    }
+    const { filters, _wip } = this.state;
     if (filter === _wip) {
       if ("value" in update && update["value"] !== "") {
         this.setState({ filters: [...filters, __spreadValues$z(__spreadValues$z({}, _wip), update)], _wip: void 0 });
@@ -5692,7 +5575,6 @@ class AdHocFiltersVariable extends SceneObjectBase {
     }
   }
   _handleComboboxBackspace(filter) {
-    var _a;
     if (this.state.filters.length) {
       let filterToForceIndex = this.state.filters.length - 1;
       if (filter !== this.state._wip) {
@@ -5714,27 +5596,6 @@ class AdHocFiltersVariable extends SceneObjectBase {
           return [...acc, f];
         }, [])
       });
-    } else if ((_a = this.state.baseFilters) == null ? void 0 : _a.length) {
-      let filterToForceIndex = this.state.baseFilters.length - 1;
-      if (filter !== this.state._wip) {
-        filterToForceIndex = -1;
-      }
-      this.setState({
-        baseFilters: this.state.baseFilters.reduce((acc, f, index) => {
-          if (index === filterToForceIndex) {
-            return [
-              ...acc,
-              __spreadProps$n(__spreadValues$z({}, f), {
-                forceEdit: true
-              })
-            ];
-          }
-          if (f === filter) {
-            return acc;
-          }
-          return [...acc, f];
-        }, [])
-      });
     }
   }
   async _getKeys(currentKey) {
@@ -5773,7 +5634,7 @@ class AdHocFiltersVariable extends SceneObjectBase {
     return keys.map(toSelectableValue);
   }
   async _getValuesFor(filter) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const override = await ((_b = (_a = this.state).getTagValuesProvider) == null ? void 0 : _b.call(_a, this, filter));
     if (override && override.replace) {
       return dataFromResponse(override.values).map(toSelectableValue);
@@ -5782,26 +5643,15 @@ class AdHocFiltersVariable extends SceneObjectBase {
     if (!ds || !ds.getTagValues) {
       return [];
     }
-    const filteredBaseFilters = (_d = (_c = this.state.baseFilters) == null ? void 0 : _c.filter((f) => f.origin && f.key !== filter.key)) != null ? _d : [];
-    const otherFilters = this.state.filters.filter((f) => f.key !== filter.key).concat(filteredBaseFilters);
+    const otherFilters = this.state.filters.filter((f) => f.key !== filter.key).concat((_c = this.state.baseFilters) != null ? _c : []);
     const timeRange = sceneGraph.getTimeRange(this).state.value;
     const queries = this.state.useQueriesAsFilterForOptions ? getQueriesForVariables(this) : void 0;
-    let scopes = (_e = this._scopesBridge) == null ? void 0 : _e.getValue();
-    if (filter.origin === "scopes" /* Scopes */) {
-      scopes = scopes == null ? void 0 : scopes.map((scope) => {
-        return __spreadProps$n(__spreadValues$z({}, scope), {
-          spec: __spreadProps$n(__spreadValues$z({}, scope.spec), {
-            filters: scope.spec.filters.filter((f) => f.key !== filter.key)
-          })
-        });
-      });
-    }
     const response = await ds.getTagValues(__spreadValues$z({
       key: filter.key,
       filters: otherFilters,
       timeRange,
       queries,
-      scopes
+      scopes: (_d = this._scopesBridge) == null ? void 0 : _d.getValue()
     }, getEnrichedFiltersRequest(this)));
     if (responseHasError(response)) {
       this.setState({ error: response.error.message });
@@ -6520,15 +6370,6 @@ function escapeUrlCommaDelimiters(value) {
   }
   return /,/g[Symbol.replace](value, "__gfc__");
 }
-function escapeUrlHashDelimiters(value) {
-  if (value === null || value === void 0) {
-    return "";
-  }
-  return /#/g[Symbol.replace](value, "__gfh__");
-}
-function escapeInjectedFilterUrlDelimiters(value) {
-  return escapeUrlHashDelimiters(escapeUrlPipeDelimiters(value));
-}
 function escapeURLDelimiters(value) {
   return escapeUrlCommaDelimiters(escapeUrlPipeDelimiters(value));
 }
@@ -6538,7 +6379,6 @@ function unescapeUrlDelimiters(value) {
   }
   value = /__gfp__/g[Symbol.replace](value, "|");
   value = /__gfc__/g[Symbol.replace](value, ",");
-  value = /__gfh__/g[Symbol.replace](value, "#");
   return value;
 }
 function toUrlCommaDelimitedString(key, label) {
@@ -10984,7 +10824,11 @@ async function getExploreURL(data, model, timeRange, transform) {
     return (_a2 = transform == null ? void 0 : transform(q)) != null ? _a2 : q;
   });
   const queries = interpolatedQueries != null ? interpolatedQueries : [];
-  const datasource = (_d = (_c = queries.find((query) => {
+  const hasMixedDatasources = new Set(queries.map((q) => {
+    var _a2;
+    return (_a2 = q.datasource) == null ? void 0 : _a2.uid;
+  })).size > 1;
+  let datasource = hasMixedDatasources ? "-- Mixed --" : (_d = (_c = queries.find((query) => {
     var _a2;
     return !!((_a2 = query.datasource) == null ? void 0 : _a2.uid);
   })) == null ? void 0 : _c.datasource) == null ? void 0 : _d.uid;
@@ -11014,10 +10858,12 @@ function VizPanelExploreButtonComponent({ model }) {
   const { options } = model.useState();
   const { data } = sceneGraph.getData(model).useState();
   const { from, to } = sceneGraph.getTimeRange(model).useState();
-  const { value: exploreLink } = reactUse.useAsync(
-    async () => data ? getExploreURL(data, model, { from, to }, options.transform) : "",
-    [data, model, from, to]
-  );
+  const { value: exploreLink } = reactUse.useAsync(async () => {
+    if (!data) {
+      return "";
+    }
+    return getExploreURL(data, model, { from, to }, options.transform);
+  }, [data, model, from, to]);
   const returnToPrevious = runtime.useReturnToPrevious();
   if (exploreLink) {
     return /* @__PURE__ */ React__default["default"].createElement(ui.LinkButton, {