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

package/dist/esm/variables/adhoc/getAdHocFiltersFromScopes.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAdHocFiltersFromScopes.js","sources":["../../../../src/variables/adhoc/getAdHocFiltersFromScopes.ts"],"sourcesContent":["import { Scope, ScopeFilterOperator, ScopeSpecFilter, scopeFilterOperatorMap } from '@grafana/data';\nimport { AdHocFilterWithLabels, FilterOrigin } from './AdHocFiltersVariable';\n\nexport type EqualityOrMultiOperator = Extract<ScopeFilterOperator, 'equals' | 'not-equals' | 'one-of' | 'not-one-of'>;\n\nexport const reverseScopeFilterOperatorMap: Record<ScopeFilterOperator, string> = Object.fromEntries(\n  Object.entries(scopeFilterOperatorMap).map(([symbol, operator]) => [operator, symbol])\n  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions\n) as Record<ScopeFilterOperator, string>;\n\nexport function isEqualityOrMultiOperator(value: string): value is EqualityOrMultiOperator {\n  const operators = new Set(['equals', 'not-equals', 'one-of', 'not-one-of']);\n  return operators.has(value);\n}\n\n// this function returns processed adhoc filters after parsing and processing\n// all scope filters from a scope list. The reason we need to process these filters is\n// because scopes can have multiple filter values with the same key. For example:\n// we have selected ScopeA which has a filter with a key1, operator one-of, a value1,\n// and a ScopeB which has a filter with key1, operator one-of, and value2. After processing,\n// the result will be just one adhoc filter with both values. This is held in formattedFilters.\n// DuplicatedFilters will containg unprocessable filters: if scopeA has instead of the one-of op\n// an equal op, then the result will be 2 adhoc filters with the same key, but diferent operator\n// and value. We return them this way and let the adhoc interface deal with this.\nexport function getAdHocFiltersFromScopes(scopes: Scope[]): AdHocFilterWithLabels[] {\n  const formattedFilters: Map<string, AdHocFilterWithLabels> = new Map();\n  // duplicated filters that could not be processed in any way are just appended to the list\n  const duplicatedFilters: AdHocFilterWithLabels[] = [];\n  const allFilters = scopes.flatMap((scope) => scope.spec.filters);\n\n  for (const filter of allFilters) {\n    processFilter(formattedFilters, duplicatedFilters, filter);\n  }\n\n  return [...formattedFilters.values(), ...duplicatedFilters];\n}\n\nfunction processFilter(\n  formattedFilters: Map<string, AdHocFilterWithLabels>,\n  duplicatedFilters: AdHocFilterWithLabels[],\n  filter: ScopeSpecFilter\n) {\n  const existingFilter = formattedFilters.get(filter.key);\n\n  if (existingFilter && canValueBeMerged(existingFilter.operator, filter.operator)) {\n    mergeFilterValues(existingFilter, filter);\n  } else if (!existingFilter) {\n    // Add filter to map either only if it is new.\n    // Otherwise it is an existing filter that cannot be converted to multi-value\n    // and thus will be moved to the duplicatedFilters list\n    formattedFilters.set(filter.key, {\n      key: filter.key,\n      operator: reverseScopeFilterOperatorMap[filter.operator],\n      value: filter.value,\n      values: filter.values ?? [filter.value],\n      origin: FilterOrigin.Scopes,\n    });\n  } else {\n    duplicatedFilters.push({\n      key: filter.key,\n      operator: reverseScopeFilterOperatorMap[filter.operator],\n      value: filter.value,\n      values: filter.values ?? [filter.value],\n      origin: FilterOrigin.Scopes,\n    });\n  }\n}\n\nfunction mergeFilterValues(adHocFilter: AdHocFilterWithLabels, filter: ScopeSpecFilter) {\n  const values = filter.values ?? [filter.value];\n\n  for (const value of values) {\n    if (!adHocFilter.values?.includes(value)) {\n      adHocFilter.values?.push(value);\n    }\n  }\n\n  // If there's only one value, there's no need to update the\n  // operator to its multi-value equivalent\n  if (adHocFilter.values?.length === 1) {\n    return;\n  }\n\n  // Otherwise update it to the equivalent multi-value operator\n  if (filter.operator === 'equals' && adHocFilter.operator === reverseScopeFilterOperatorMap['equals']) {\n    adHocFilter.operator = reverseScopeFilterOperatorMap['one-of'];\n  } else if (filter.operator === 'not-equals' && adHocFilter.operator === reverseScopeFilterOperatorMap['not-equals']) {\n    adHocFilter.operator = reverseScopeFilterOperatorMap['not-one-of'];\n  }\n}\n\nfunction canValueBeMerged(adHocFilterOperator: string, filterOperator: string) {\n  const scopeConvertedOperator = scopeFilterOperatorMap[adHocFilterOperator];\n\n  if (!isEqualityOrMultiOperator(scopeConvertedOperator) || !isEqualityOrMultiOperator(filterOperator)) {\n    return false;\n  }\n\n  if (\n    (scopeConvertedOperator.includes('not') && !filterOperator.includes('not')) ||\n    (!scopeConvertedOperator.includes('not') && filterOperator.includes('not'))\n  ) {\n    return false;\n  }\n\n  return true;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"getAdHocFiltersFromScopes.js","sources":["../../../../src/variables/adhoc/getAdHocFiltersFromScopes.ts"],"sourcesContent":["import { Scope, ScopeFilterOperator, ScopeSpecFilter, scopeFilterOperatorMap } from '@grafana/data';\nimport { AdHocFilterWithLabels } from './AdHocFiltersVariable';\n\nexport type EqualityOrMultiOperator = Extract<ScopeFilterOperator, 'equals' | 'not-equals' | 'one-of' | 'not-one-of'>;\n\nexport const reverseScopeFilterOperatorMap: Record<ScopeFilterOperator, string> = Object.fromEntries(\n  Object.entries(scopeFilterOperatorMap).map(([symbol, operator]) => [operator, symbol])\n  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions\n) as Record<ScopeFilterOperator, string>;\n\nexport function isEqualityOrMultiOperator(value: string): value is EqualityOrMultiOperator {\n  const operators = new Set(['equals', 'not-equals', 'one-of', 'not-one-of']);\n  return operators.has(value);\n}\n\n// this function returns processed adhoc filters after parsing and processing\n// all scope filters from a scope list. The reason we need to process these filters is\n// because scopes can have multiple filter values with the same key. For example:\n// we have selected ScopeA which has a filter with a key1, operator one-of, a value1,\n// and a ScopeB which has a filter with key1, operator one-of, and value2. After processing,\n// the result will be just one adhoc filter with both values. This is held in formattedFilters.\n// DuplicatedFilters will containg unprocessable filters: if scopeA has instead of the one-of op\n// an equal op, then the result will be 2 adhoc filters with the same key, but diferent operator\n// and value. We return them this way and let the adhoc interface deal with this.\nexport function getAdHocFiltersFromScopes(scopes: Scope[]): AdHocFilterWithLabels[] {\n  const formattedFilters: Map<string, AdHocFilterWithLabels> = new Map();\n  // duplicated filters that could not be processed in any way are just appended to the list\n  const duplicatedFilters: AdHocFilterWithLabels[] = [];\n  const allFilters = scopes.flatMap((scope) => scope.spec.filters);\n\n  for (const filter of allFilters) {\n    processFilter(formattedFilters, duplicatedFilters, filter);\n  }\n\n  return [...formattedFilters.values(), ...duplicatedFilters];\n}\n\nfunction processFilter(\n  formattedFilters: Map<string, AdHocFilterWithLabels>,\n  duplicatedFilters: AdHocFilterWithLabels[],\n  filter: ScopeSpecFilter\n) {\n  const existingFilter = formattedFilters.get(filter.key);\n\n  if (existingFilter && canValueBeMerged(existingFilter.operator, filter.operator)) {\n    mergeFilterValues(existingFilter, filter);\n  } else if (!existingFilter) {\n    // Add filter to map either only if it is new.\n    // Otherwise it is an existing filter that cannot be converted to multi-value\n    // and thus will be moved to the duplicatedFilters list\n    formattedFilters.set(filter.key, {\n      key: filter.key,\n      operator: reverseScopeFilterOperatorMap[filter.operator],\n      value: filter.value,\n      values: filter.values ?? [filter.value],\n      origin: 'scope',\n    });\n  } else {\n    duplicatedFilters.push({\n      key: filter.key,\n      operator: reverseScopeFilterOperatorMap[filter.operator],\n      value: filter.value,\n      values: filter.values ?? [filter.value],\n      origin: 'scope',\n    });\n  }\n}\n\nfunction mergeFilterValues(adHocFilter: AdHocFilterWithLabels, filter: ScopeSpecFilter) {\n  const values = filter.values ?? [filter.value];\n\n  for (const value of values) {\n    if (!adHocFilter.values?.includes(value)) {\n      adHocFilter.values?.push(value);\n    }\n  }\n\n  // If there's only one value, there's no need to update the\n  // operator to its multi-value equivalent\n  if (adHocFilter.values?.length === 1) {\n    return;\n  }\n\n  // Otherwise update it to the equivalent multi-value operator\n  if (filter.operator === 'equals' && adHocFilter.operator === reverseScopeFilterOperatorMap['equals']) {\n    adHocFilter.operator = reverseScopeFilterOperatorMap['one-of'];\n  } else if (filter.operator === 'not-equals' && adHocFilter.operator === reverseScopeFilterOperatorMap['not-equals']) {\n    adHocFilter.operator = reverseScopeFilterOperatorMap['not-one-of'];\n  }\n}\n\nfunction canValueBeMerged(adHocFilterOperator: string, filterOperator: string) {\n  const scopeConvertedOperator = scopeFilterOperatorMap[adHocFilterOperator];\n\n  if (!isEqualityOrMultiOperator(scopeConvertedOperator) || !isEqualityOrMultiOperator(filterOperator)) {\n    return false;\n  }\n\n  if (\n    (scopeConvertedOperator.includes('not') && !filterOperator.includes('not')) ||\n    (!scopeConvertedOperator.includes('not') && filterOperator.includes('not'))\n  ) {\n    return false;\n  }\n\n  return true;\n}\n"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -859,14 +859,12 @@ interface AdHocFilterWithLabels<M extends Record<string, any> = {}> extends AdHo
     hidden?: boolean;
     meta?: M;
     origin?: FilterOrigin;
-    originalValue?: string[];
+    matchAllFilter?: boolean;
     readOnly?: boolean;
+    restorable?: boolean;
 }
 type AdHocControlsLayout = ControlsLayout | 'combobox';
-declare enum FilterOrigin {
-    Scopes = "scopes",
-    Dashboards = "dashboards"
-}
+type FilterOrigin = 'dashboard' | 'scope';
 interface AdHocFiltersVariableState extends SceneVariableState {
     /** Optional text to display on the 'add filter' button */
     addFilterButtonText?: string;
@@ -968,6 +966,7 @@ declare class AdHocFiltersVariable extends SceneObjectBase<AdHocFiltersVariableS
     private _scopedVars;
     private _dataSourceSrv;
     private _scopesBridge;
+    private _originalValues;
     protected _urlSync: AdHocFiltersVariableUrlSyncHandler;
     constructor(state: Partial<AdHocFiltersVariableState>);
     private _activationHandler;
@@ -985,6 +984,7 @@ declare class AdHocFiltersVariable extends SceneObjectBase<AdHocFiltersVariableS
     restoreOriginalFilter(filter: AdHocFilterWithLabels): void;
     getValue(): VariableValue | undefined;
     _updateFilter(filter: AdHocFilterWithLabels, update: Partial<AdHocFilterWithLabels>): void;
+    updateToMatchAll(filter: AdHocFilterWithLabels): void;
     _removeFilter(filter: AdHocFilterWithLabels): void;
     _removeLastFilter(): void;
     _handleComboboxBackspace(filter: AdHocFilterWithLabels): void;
@@ -3023,5 +3023,5 @@ declare const sceneUtils: {
     isGroupByVariable: typeof isGroupByVariable;
 };
 
-export { AdHocFiltersVariable, ConstantVariable, ControlsLabel, CustomVariable, DataProviderProxy, DataSourceVariable, EmbeddedScene, FieldConfigBuilder, FieldConfigBuilders, FieldConfigOverridesBuilder, FilterOrigin, GroupByVariable, IntervalVariable, LazyLoader, LocalValueVariable, MultiOrSingleValueSelect, MultiValueVariable, NestedScene, NewSceneObjectAddedEvent, 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, SceneScopesBridge, SceneTimePicker, SceneTimeRange, SceneTimeRangeCompare, SceneTimeRangeTransformerBase, SceneTimeZoneOverride, SceneToolbarButton, SceneToolbarInput, SceneVariableSet, SceneVariableValueChangedEvent, SplitLayout, TestVariable, TextBoxVariable, UrlSyncContextProvider, UrlSyncManager, UserActionEvent, VariableDependencyConfig, VariableValueControl, VariableValueSelectWrapper, VariableValueSelectors, VizConfigBuilder, VizConfigBuilders, VizPanel, VizPanelBuilder, VizPanelExploreButton, VizPanelMenu, index$1 as behaviors, index as dataLayers, formatRegistry, getExploreURL, isCustomVariableValue, isDataLayer, isDataRequestEnricher, isFiltersRequestEnricher, isSceneObject, registerQueryWithController, registerRuntimeDataSource, sceneGraph, sceneUtils, useSceneApp, useSceneObjectState, useUrlSync };
+export { AdHocFiltersVariable, ConstantVariable, ControlsLabel, CustomVariable, DataProviderProxy, DataSourceVariable, EmbeddedScene, FieldConfigBuilder, FieldConfigBuilders, FieldConfigOverridesBuilder, GroupByVariable, IntervalVariable, LazyLoader, LocalValueVariable, MultiOrSingleValueSelect, MultiValueVariable, NestedScene, NewSceneObjectAddedEvent, 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, SceneScopesBridge, SceneTimePicker, SceneTimeRange, SceneTimeRangeCompare, SceneTimeRangeTransformerBase, SceneTimeZoneOverride, SceneToolbarButton, SceneToolbarInput, SceneVariableSet, SceneVariableValueChangedEvent, SplitLayout, TestVariable, TextBoxVariable, UrlSyncContextProvider, UrlSyncManager, UserActionEvent, VariableDependencyConfig, VariableValueControl, VariableValueSelectWrapper, VariableValueSelectors, VizConfigBuilder, VizConfigBuilders, VizPanel, VizPanelBuilder, VizPanelExploreButton, VizPanelMenu, index$1 as behaviors, index as dataLayers, formatRegistry, getExploreURL, isCustomVariableValue, isDataLayer, isDataRequestEnricher, isFiltersRequestEnricher, isSceneObject, registerQueryWithController, registerRuntimeDataSource, sceneGraph, sceneUtils, useSceneApp, useSceneObjectState, useUrlSync };
 export type { AdHocFilterWithLabels, 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, SceneInteractionProfileEvent, 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 };

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";
@@ -4298,6 +4309,9 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
   }, [model, isAlwaysWip]);
   const handleMultiValueFilterCommit = React.useCallback(
     (model2, filter2, filterMultiValues2, preventFocus) => {
+      if (!filterMultiValues2.length && filter2.origin) {
+        model2.updateToMatchAll(filter2);
+      }
       if (filterMultiValues2.length) {
         const valueLabels = [];
         const values = [];
@@ -4947,7 +4961,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 +4983,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 +5013,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 +5030,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 +5088,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 +5216,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 +5224,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 +5256,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 +5296,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 +5311,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 +5324,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 +5435,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 +5455,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 +5482,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 +5610,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 +5697,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 +13967,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;