@grafana/scenes 6.9.1 → 6.10.0--canary.1095.14616202286.0

package/dist/index.js

@@ -3783,13 +3783,8 @@ class AdHocFiltersVariableUrlSyncHandler {
     }
     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}`
-            );
-          }
+        ...baseFilters == null ? void 0 : baseFilters.filter(isFilterComplete).filter((filter) => !filter.hidden && filter.origin && filter.restorable).map(
+          (filter) => toArray(filter).map(escapeInjectedFilterUrlDelimiters).join("|").concat(`#${filter.origin}#restorable`)
         )
       );
     }
@@ -3802,13 +3797,30 @@ class AdHocFiltersVariableUrlSyncHandler {
     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);
+    const baseFilters = [...this._variable.state.baseFilters || []];
+    for (let i = 0; i < filters.length; i++) {
+      const foundBaseFilterIndex = baseFilters.findIndex((f) => f.key === filters[i].key);
+      if (foundBaseFilterIndex > -1) {
+        if (!filters[i].origin && baseFilters[foundBaseFilterIndex].origin === "dashboard") {
+          filters[i].origin = "dashboard";
+          filters[i].restorable = true;
+        }
+        if (isMatchAllFilter(filters[i])) {
+          filters[i].matchAllFilter = true;
+        }
+        baseFilters[foundBaseFilterIndex] = filters[i];
+      } else if (filters[i].origin === "dashboard") {
+        delete filters[i].origin;
+        delete filters[i].restorable;
+      } else if (foundBaseFilterIndex === -1 && filters[i].origin === "scope" && filters[i].restorable) {
+        baseFilters.push(filters[i]);
+      }
+    }
+    this._variable.setState({
+      filters: filters.filter((f) => !f.origin),
+      baseFilters
+    });
   }
 }
 function deserializeUrlToFilters(value) {
@@ -3833,11 +3845,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 [filter, origin, restorable] = 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);
@@ -3851,12 +3862,12 @@ function toFilter(urlValue) {
     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
+    ...isFilterOrigin(origin) && { origin },
+    ...!!restorable && { restorable: true }
   };
 }
 function isFilterOrigin(value) {
-  return value === FilterOrigin.Scopes || value === FilterOrigin.Dashboards;
+  return value === "scope" || value === "dashboard";
 }
 function isFilter(filter) {
   return filter !== null && typeof filter.key === "string" && typeof filter.value === "string";
@@ -4947,7 +4958,11 @@ function AdHocFilterPill({ filter, model, readOnly, focusOnWipInputRef }) {
     return /* @__PURE__ */ React__default.default.createElement(
       "div",
       {
-        className: css.cx(styles.combinedFilterPill, readOnly && styles.readOnlyCombinedFilter),
+        className: css.cx(
+          styles.combinedFilterPill,
+          readOnly && styles.readOnlyCombinedFilter,
+          isMatchAllFilter(filter) && styles.matchAllPill
+        ),
         onClick: (e) => {
           e.stopPropagation();
           setPopulateInputOnEdit(true);
@@ -4965,19 +4980,27 @@ function AdHocFilterPill({ filter, model, readOnly, focusOnWipInputRef }) {
         ref: pillWrapperRef
       },
       valueLabel.length < LABEL_MAX_VISIBLE_LENGTH ? pillText : /* @__PURE__ */ React__default.default.createElement(ui.Tooltip, { content: /* @__PURE__ */ React__default.default.createElement("div", { className: styles.tooltipText }, valueLabel), placement: "top" }, pillText),
-      !readOnly && !filter.origin ? /* @__PURE__ */ React__default.default.createElement(
+      !readOnly && !filter.matchAllFilter && (!filter.origin || filter.origin === "dashboard") ? /* @__PURE__ */ React__default.default.createElement(
         ui.IconButton,
         {
           onClick: (e) => {
             e.stopPropagation();
-            model._removeFilter(filter);
+            if (filter.origin && filter.origin === "dashboard") {
+              model.updateToMatchAll(filter);
+            } else {
+              model._removeFilter(filter);
+            }
             setTimeout(() => focusOnWipInputRef == null ? void 0 : focusOnWipInputRef());
           },
           onKeyDownCapture: (e) => {
             if (e.key === "Enter") {
               e.preventDefault();
               e.stopPropagation();
-              model._removeFilter(filter);
+              if (filter.origin && filter.origin === "dashboard") {
+                model.updateToMatchAll(filter);
+              } else {
+                model._removeFilter(filter);
+              }
               setTimeout(() => focusOnWipInputRef == null ? void 0 : focusOnWipInputRef());
             }
           },
@@ -4987,16 +5010,8 @@ function AdHocFilterPill({ filter, model, readOnly, focusOnWipInputRef }) {
           tooltip: `Remove filter with key ${keyLabel}`
         }
       ) : 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(
+      filter.origin && !filter.restorable && /* @__PURE__ */ React__default.default.createElement(ui.Tooltip, { content: `This is a ${filter.origin} injected filter`, placement: "bottom" }, /* @__PURE__ */ React__default.default.createElement(ui.Icon, { name: "info-circle", size: "md", className: styles.infoPillIcon })),
+      filter.origin && filter.restorable && /* @__PURE__ */ React__default.default.createElement(
         ui.IconButton,
         {
           onClick: (e) => {
@@ -5012,7 +5027,7 @@ function AdHocFilterPill({ filter, model, readOnly, focusOnWipInputRef }) {
           },
           name: "history",
           size: "md",
-          className: styles.pillIcon,
+          className: isMatchAllFilter(filter) ? styles.matchAllPillIcon : styles.pillIcon,
           tooltip: `Restore filter to its original value`
         }
       )
@@ -5070,6 +5085,23 @@ const getStyles$b = (theme) => ({
   }),
   tooltipText: css.css({
     textAlign: "center"
+  }),
+  infoPillIcon: css.css({
+    marginInline: theme.spacing(0.5),
+    cursor: "pointer"
+  }),
+  matchAllPillIcon: css.css({
+    marginInline: theme.spacing(0.5),
+    cursor: "pointer",
+    color: theme.colors.text.disabled
+  }),
+  matchAllPill: css.css({
+    background: theme.colors.action.selected,
+    color: theme.colors.text.disabled,
+    border: 0,
+    "&:hover": {
+      background: theme.colors.action.selected
+    }
   })
 });
 
@@ -5181,7 +5213,7 @@ function processFilter(formattedFilters, duplicatedFilters, filter) {
       operator: reverseScopeFilterOperatorMap[filter.operator],
       value: filter.value,
       values: (_a = filter.values) != null ? _a : [filter.value],
-      origin: FilterOrigin.Scopes
+      origin: "scope"
     });
   } else {
     duplicatedFilters.push({
@@ -5189,7 +5221,7 @@ function processFilter(formattedFilters, duplicatedFilters, filter) {
       operator: reverseScopeFilterOperatorMap[filter.operator],
       value: filter.value,
       values: (_b = filter.values) != null ? _b : [filter.value],
-      origin: FilterOrigin.Scopes
+      origin: "scope"
     });
   }
 }
@@ -5221,11 +5253,6 @@ function canValueBeMerged(adHocFilterOperator, filterOperator) {
   return true;
 }
 
-var FilterOrigin = /* @__PURE__ */ ((FilterOrigin2) => {
-  FilterOrigin2["Scopes"] = "scopes";
-  FilterOrigin2["Dashboards"] = "dashboards";
-  return FilterOrigin2;
-})(FilterOrigin || {});
 const OPERATORS = [
   {
     value: "=",
@@ -5266,7 +5293,7 @@ const OPERATORS = [
 ];
 class AdHocFiltersVariable extends SceneObjectBase {
   constructor(state) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     super({
       type: "adhoc",
       name: (_a = state.name) != null ? _a : "Filters",
@@ -5281,6 +5308,10 @@ class AdHocFiltersVariable extends SceneObjectBase {
     });
     this._scopedVars = { __sceneObject: wrapInSafeSerializableSceneObject(this) };
     this._dataSourceSrv = runtime.getDataSourceSrv();
+    // holds the originalValues of all baseFilters in a map. The values
+    // are set on construct and used to restore a baseFilter with an origin
+    // to its original value if edited at some point
+    this._originalValues = /* @__PURE__ */ new Map();
     this._urlSync = new AdHocFiltersVariableUrlSyncHandler(this);
     this._activationHandler = () => {
       var _a, _b;
@@ -5290,52 +5321,75 @@ class AdHocFiltersVariable extends SceneObjectBase {
         this._updateScopesFilters(scopes);
       }
       const sub = (_b = this._scopesBridge) == null ? void 0 : _b.subscribeToValue((n, _) => {
-        var _a2;
-        this._updateScopesFilters(n, (_a2 = this._scopesBridge) == null ? void 0 : _a2.isLoading());
+        this._updateScopesFilters(n);
       });
       return () => {
+        var _a2, _b2;
         sub == null ? void 0 : sub.unsubscribe();
-      };
-    };
-    this._updateScopesFilters = (scopes, areScopesLoading) => {
-      var _a, _b;
-      if (!scopes.length) {
-        this.setState({
-          baseFilters: (_a = this.state.baseFilters) == null ? void 0 : _a.filter((filter) => filter.origin !== "scopes" /* Scopes */)
-        });
-        return;
-      }
-      const scopeFilters = getAdHocFiltersFromScopes(scopes);
-      let finalFilters = scopeFilters;
-      const scopeInjectedFilters = [];
-      const remainingFilters = [];
-      (_b = this.state.baseFilters) == null ? void 0 : _b.forEach((filter) => {
-        if (filter.origin === "scopes" /* Scopes */) {
-          scopeInjectedFilters.push(filter);
-        } else {
-          remainingFilters.push(filter);
+        if ((_a2 = this.state.baseFilters) == null ? void 0 : _a2.length) {
+          this.setState({
+            baseFilters: [...this.state.baseFilters.filter((filter) => filter.origin !== "scope")]
+          });
+          (_b2 = this.state.baseFilters) == null ? void 0 : _b2.forEach((filter) => {
+            if (filter.origin === "dashboard" && filter.restorable) {
+              this.restoreOriginalFilter(filter);
+            }
+          });
         }
-      });
-      if (!scopeFilters.length) {
-        return;
-      }
-      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.setState({ baseFilters: [...remainingFilters, ...finalFilters] });
+      };
     };
     if (this.state.applyMode === "auto") {
       patchGetAdhocFilters(this);
     }
+    (_f = this.state.baseFilters) == null ? void 0 : _f.forEach((baseFilter) => {
+      var _a2;
+      if (baseFilter.origin === "dashboard") {
+        this._originalValues.set(baseFilter.key, {
+          operator: baseFilter.operator,
+          value: (_a2 = baseFilter.values) != null ? _a2 : [baseFilter.value]
+        });
+      }
+    });
     this.addActivationHandler(this._activationHandler);
   }
+  _updateScopesFilters(scopes) {
+    var _a, _b;
+    if (!scopes.length) {
+      this.setState({
+        baseFilters: (_a = this.state.baseFilters) == null ? void 0 : _a.filter((filter) => filter.origin !== "scope")
+      });
+      return;
+    }
+    const scopeFilters = getAdHocFiltersFromScopes(scopes);
+    if (!scopeFilters.length) {
+      return;
+    }
+    let finalFilters = scopeFilters;
+    const scopeInjectedFilters = [];
+    const remainingFilters = [];
+    finalFilters.forEach((scopeFilter) => {
+      var _a2;
+      this._originalValues.set(scopeFilter.key, {
+        value: (_a2 = scopeFilter.values) != null ? _a2 : [scopeFilter.value],
+        operator: scopeFilter.operator
+      });
+    });
+    (_b = this.state.baseFilters) == null ? void 0 : _b.forEach((filter) => {
+      if (filter.origin === "scope") {
+        scopeInjectedFilters.push(filter);
+      } else {
+        remainingFilters.push(filter);
+      }
+    });
+    const editedScopeFilters = scopeInjectedFilters.filter((filter) => filter.restorable);
+    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.setState({ baseFilters: [...finalFilters, ...remainingFilters] });
+  }
   setState(update) {
     var _a, _b, _c;
     let filterExpressionChanged = false;
@@ -5378,14 +5432,16 @@ class AdHocFiltersVariable extends SceneObjectBase {
     }
   }
   restoreOriginalFilter(filter) {
-    var _a;
     const original = {
-      originalValue: void 0
+      matchAllFilter: false,
+      restorable: false
     };
-    if ((_a = filter.originalValue) == null ? void 0 : _a.length) {
-      original.value = filter.originalValue[0];
-      original.values = filter.originalValue;
-      original.valueLabels = filter.originalValue;
+    if (filter.restorable) {
+      const originalFilter = this._originalValues.get(filter.key);
+      original.value = originalFilter == null ? void 0 : originalFilter.value[0];
+      original.values = originalFilter == null ? void 0 : originalFilter.value;
+      original.valueLabels = originalFilter == null ? void 0 : originalFilter.value;
+      original.operator = originalFilter == null ? void 0 : originalFilter.operator;
     }
     this._updateFilter(filter, original);
   }
@@ -5396,14 +5452,13 @@ class AdHocFiltersVariable extends SceneObjectBase {
     var _a;
     const { baseFilters, filters, _wip } = this.state;
     if (filter.origin) {
-      const currentValues = filter.values ? filter.values : [filter.value];
+      const originalValues = this._originalValues.get(filter.key);
       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 isRestorableOverride = update.hasOwnProperty("restorable");
+      if (!isRestorableOverride && (updateValues && !lodash.isEqual(updateValues, originalValues == null ? void 0 : originalValues.value) || update.operator && update.operator !== (originalValues == null ? void 0 : originalValues.operator))) {
+        update.restorable = true;
+      } else if (updateValues && lodash.isEqual(updateValues, originalValues == null ? void 0 : originalValues.value)) {
+        update.restorable = false;
       }
       const updatedBaseFilters = (_a = baseFilters == null ? void 0 : baseFilters.map((f) => {
         return f === filter ? { ...f, ...update } : f;
@@ -5424,6 +5479,16 @@ class AdHocFiltersVariable extends SceneObjectBase {
     });
     this.setState({ filters: updatedFilters });
   }
+  updateToMatchAll(filter) {
+    this._updateFilter(filter, {
+      operator: "=~",
+      value: ".*",
+      values: [".*"],
+      valueLabels: ["All"],
+      matchAllFilter: true,
+      restorable: true
+    });
+  }
   _removeFilter(filter) {
     if (filter === this.state._wip) {
       this.setState({ _wip: void 0 });
@@ -5542,7 +5607,7 @@ class AdHocFiltersVariable extends SceneObjectBase {
     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 */) {
+    if (filter.origin === "scope") {
       scopes = scopes == null ? void 0 : scopes.map((scope) => {
         return {
           ...scope,
@@ -5629,6 +5694,9 @@ function toSelectableValue(input) {
   }
   return result;
 }
+function isMatchAllFilter(filter) {
+  return filter.operator === "=~" && filter.value === ".*";
+}
 function isFilterComplete(filter) {
   return filter.key !== "" && filter.operator !== "" && filter.value !== "";
 }
@@ -13896,7 +13964,6 @@ exports.EmbeddedScene = EmbeddedScene;
 exports.FieldConfigBuilder = FieldConfigBuilder;
 exports.FieldConfigBuilders = FieldConfigBuilders;
 exports.FieldConfigOverridesBuilder = FieldConfigOverridesBuilder;
-exports.FilterOrigin = FilterOrigin;
 exports.GroupByVariable = GroupByVariable;
 exports.IntervalVariable = IntervalVariable;
 exports.LazyLoader = LazyLoader;