@grafana/scenes 6.4.1 → 6.5.0--canary.1062.13950464645.0

package/dist/index.js

@@ -3972,19 +3972,44 @@ class AdHocFiltersVariableUrlSyncHandler {
   }
   getUrlState() {
     const filters = this._variable.state.filters;
-    if (filters.length === 0) {
+    const baseFilters = this._variable.state.baseFilters;
+    let value = [];
+    if (filters.length === 0 && (baseFilters == null ? void 0 : baseFilters.length) === 0) {
       return { [this.getKey()]: [""] };
     }
-    const value = filters.filter(isFilterComplete).filter((filter) => !filter.hidden).map((filter) => toArray(filter).map(escapeUrlPipeDelimiters).join("|"));
-    return { [this.getKey()]: value };
+    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 : [""]
+    };
   }
   updateFromUrl(values) {
     const urlValue = values[this.getKey()];
     if (urlValue == null) {
       return;
     }
-    const filters = deserializeUrlToFilters(urlValue);
-    this._variable.setState({ filters });
+    if (urlValue) {
+      const filters = deserializeUrlToFilters(urlValue);
+      this._variable.setState({
+        filters: filters.filter((f) => !f.origin),
+        baseFilters: filters.filter((f) => f.origin)
+      });
+    }
   }
 }
 function deserializeUrlToFilters(value) {
@@ -4009,10 +4034,12 @@ function toArray(filter) {
   return result;
 }
 function toFilter(urlValue) {
+  var _a;
   if (typeof urlValue !== "string" || urlValue.length === 0) {
     return null;
   }
-  const [key, keyLabel, operator, _operatorLabel, ...values] = urlValue.split("|").reduce((acc, v) => {
+  const [filter, originalValues, origin] = urlValue.split("#");
+  const [key, keyLabel, operator, _operatorLabel, ...values] = filter.split("|").reduce((acc, v) => {
     const [key2, label] = v.split(",");
     acc.push(key2, label != null ? label : key2);
     return acc;
@@ -4024,9 +4051,14 @@ 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: ""
+    condition: "",
+    origin: isFilterOrigin(origin) ? origin : void 0,
+    originalValue: originalValues && originalValues.length ? (_a = originalValues.split("|")) != null ? _a : [originalValues] : void 0
   };
 }
+function isFilterOrigin(value) {
+  return value === FilterOrigin.Scopes || value === FilterOrigin.Dashboards;
+}
 function isFilter(filter) {
   return filter !== null && typeof filter.key === "string" && typeof filter.value === "string";
 }
@@ -4688,6 +4720,9 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
               return;
             }
           }
+          if (filter == null ? void 0 : filter.origin) {
+            return;
+          }
           setInputType("operator");
           return;
         }
@@ -4874,25 +4909,36 @@ 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", {
+  }, keyLabel) : null, (filter == null ? void 0 : filter.key) && (filter == null ? void 0 : filter.operator) && filterInputType !== "operator" ? /* @__PURE__ */ React__default["default"].createElement("div", __spreadValues$B({
     id: operatorIdentifier,
-    className: css.cx(styles.basePill, styles.operatorPill, operatorIdentifier),
-    role: "button",
+    className: css.cx(
+      styles.basePill,
+      !filter.origin && styles.operatorPill,
+      filter.origin && styles.keyPill,
+      operatorIdentifier
+    ),
     "aria-label": "Edit filter operator",
-    tabIndex: 0,
+    tabIndex: filter.origin ? -1 : 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.operator) : null, /* @__PURE__ */ React__default["default"].createElement("div", {
+  }, !filter.origin && { role: "button" }), 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}`,
@@ -5139,13 +5185,13 @@ function AdHocFilterPill({ filter, model, readOnly, focusOnWipInputRef }) {
   const handleChangeViewMode = React.useCallback(
     (event, shouldFocusOnPillWrapperOverride) => {
       event == null ? void 0 : event.stopPropagation();
-      if (readOnly || filter.origin) {
+      if (readOnly) {
         return;
       }
       setShouldFocusOnPillWrapper(shouldFocusOnPillWrapperOverride != null ? shouldFocusOnPillWrapperOverride : !viewMode);
       setViewMode(!viewMode);
     },
-    [readOnly, viewMode, filter.origin]
+    [readOnly, viewMode]
   );
   React.useEffect(() => {
     var _a2;
@@ -5209,11 +5255,20 @@ function AdHocFilterPill({ filter, model, readOnly, focusOnWipInputRef }) {
       size: "md",
       className: styles.pillIcon,
       tooltip: `Remove filter with key ${keyLabel}`
-    }) : null, filter.origin && /* @__PURE__ */ React__default["default"].createElement(ui.IconButton, {
+    }) : null, filter.origin && !filter.originalValue && /* @__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, {
@@ -5478,14 +5533,17 @@ const OPERATORS = [
 ];
 class AdHocFiltersVariable extends SceneObjectBase {
   constructor(state) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e;
     super(__spreadValues$z({
       type: "adhoc",
       name: (_a = state.name) != null ? _a : "Filters",
       filters: [],
       datasource: null,
       applyMode: "auto",
-      filterExpression: (_b = state.filterExpression) != null ? _b : renderExpression(state.expressionBuilder, state.filters)
+      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 : []
+      ])
     }, state));
     this._scopedVars = { __sceneObject: wrapInSafeSerializableSceneObject(this) };
     this._dataSourceSrv = runtime.getDataSourceSrv();
@@ -5498,18 +5556,44 @@ class AdHocFiltersVariable extends SceneObjectBase {
         this._updateScopesFilters(scopes);
       }
       const sub = (_b = this._scopesBridge) == null ? void 0 : _b.subscribeToValue((n, _) => {
-        this._updateScopesFilters(n);
+        var _a2;
+        this._updateScopesFilters(n, (_a2 = this._scopesBridge) == null ? void 0 : _a2.isLoading());
       });
       return () => {
         sub == null ? void 0 : sub.unsubscribe();
       };
     };
-    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._updateScopesFilters = (scopes, areScopesLoading) => {
+      var _a;
+      const scopeFilters = getAdHocFiltersFromScopes(scopes);
+      if (!scopeFilters.length) {
+        this._overwriteScopes = areScopesLoading;
+        return;
+      }
+      let finalFilters = scopeFilters;
+      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);
+        }
+      });
+      if (!this._overwriteScopes) {
+        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))
+        ];
+        this._overwriteScopes = false;
+      }
+      const newFilters = [...remainingFilters, ...finalFilters];
       this.setState({ baseFilters: newFilters });
     };
     if (this.state.applyMode === "auto") {
@@ -5518,9 +5602,15 @@ 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.filterExpression) {
-      update.filterExpression = renderExpression(this.state.expressionBuilder, update.filters);
+    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 : []
+      ]);
       filterExpressionChanged = update.filterExpression !== this.state.filterExpression;
     }
     super.setState(update);
@@ -5529,10 +5619,14 @@ 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, filters);
+      filterExpression = renderExpression(this.state.expressionBuilder, [
+        ...(_b = (_a = this.state.baseFilters) == null ? void 0 : _a.filter((filter) => filter.origin)) != null ? _b : [],
+        ...filters
+      ]);
       filterExpressionChanged = filterExpression !== this.state.filterExpression;
     }
     super.setState({
@@ -5543,11 +5637,40 @@ 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) {
-    const { filters, _wip } = this.state;
+    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;
+    }
     if (filter === _wip) {
       if ("value" in update && update["value"] !== "") {
         this.setState({ filters: [...filters, __spreadValues$z(__spreadValues$z({}, _wip), update)], _wip: void 0 });
@@ -5575,6 +5698,7 @@ 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) {
@@ -5596,6 +5720,27 @@ 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) {
@@ -5634,7 +5779,7 @@ class AdHocFiltersVariable extends SceneObjectBase {
     return keys.map(toSelectableValue);
   }
   async _getValuesFor(filter) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     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);
@@ -5643,15 +5788,26 @@ class AdHocFiltersVariable extends SceneObjectBase {
     if (!ds || !ds.getTagValues) {
       return [];
     }
-    const otherFilters = this.state.filters.filter((f) => f.key !== filter.key).concat((_c = this.state.baseFilters) != null ? _c : []);
+    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 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: (_d = this._scopesBridge) == null ? void 0 : _d.getValue()
+      scopes
     }, getEnrichedFiltersRequest(this)));
     if (responseHasError(response)) {
       this.setState({ error: response.error.message });
@@ -6370,6 +6526,15 @@ 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));
 }
@@ -6379,6 +6544,7 @@ 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) {