@grafana/scenes 6.29.3--canary.1206.16749060237.0 → 6.29.3

package/dist/index.js

@@ -5676,6 +5676,10 @@ function isEqualityOrMultiOperator(value) {
   const operators = /* @__PURE__ */ new Set(["equals", "not-equals", "one-of", "not-one-of"]);
   return operators.has(value);
 }
+function isRegexOperator(value) {
+  const operators = /* @__PURE__ */ new Set(["regex-match", "regex-not-match"]);
+  return operators.has(value);
+}
 function getAdHocFiltersFromScopes(scopes) {
   const formattedFilters = /* @__PURE__ */ new Map();
   const duplicatedFilters = [];
@@ -5691,8 +5695,11 @@ function processFilter(formattedFilters, duplicatedFilters, filter) {
     return;
   }
   const existingFilter = formattedFilters.get(filter.key);
-  if (existingFilter && canValueBeMerged(existingFilter.operator, filter.operator)) {
+  if (existingFilter && isEqualityValue(existingFilter.operator, filter.operator)) {
     mergeFilterValues(existingFilter, filter);
+  } else if (existingFilter && isRegexValue(existingFilter.operator, filter.operator)) {
+    existingFilter.value += `|${filter.value}`;
+    existingFilter.values = [existingFilter.value];
   } else if (!existingFilter) {
     formattedFilters.set(filter.key, {
       key: filter.key,
@@ -5728,11 +5735,21 @@ function mergeFilterValues(adHocFilter, filter) {
     adHocFilter.operator = reverseScopeFilterOperatorMap["not-one-of"];
   }
 }
-function canValueBeMerged(adHocFilterOperator, filterOperator) {
+function isRegexValue(adHocFilterOperator, filterOperator) {
+  const scopeConvertedOperator = data.scopeFilterOperatorMap[adHocFilterOperator];
+  if (!isRegexOperator(scopeConvertedOperator) || !isRegexOperator(filterOperator)) {
+    return false;
+  }
+  return hasSameOperators(scopeConvertedOperator, filterOperator);
+}
+function isEqualityValue(adHocFilterOperator, filterOperator) {
   const scopeConvertedOperator = data.scopeFilterOperatorMap[adHocFilterOperator];
   if (!isEqualityOrMultiOperator(scopeConvertedOperator) || !isEqualityOrMultiOperator(filterOperator)) {
     return false;
   }
+  return hasSameOperators(scopeConvertedOperator, filterOperator);
+}
+function hasSameOperators(scopeConvertedOperator, filterOperator) {
   if (scopeConvertedOperator.includes("not") && !filterOperator.includes("not") || !scopeConvertedOperator.includes("not") && filterOperator.includes("not")) {
     return false;
   }
@@ -5802,11 +5819,9 @@ class AdHocFiltersVariable extends SceneObjectBase {
       onReferencedVariableValueChanged: () => this._updateScopesFilters()
     });
     this._urlSync = new AdHocFiltersVariableUrlSyncHandler(this);
+    this._debouncedVerifyApplicability = lodash.debounce(this._verifyApplicability, 100);
     this._activationHandler = () => {
-      this._setStateWithFiltersApplicabilityCheck({
-        filters: this.state.filters,
-        originFilters: this.state.originFilters
-      });
+      this._debouncedVerifyApplicability();
       return () => {
         var _a;
         (_a = this.state.originFilters) == null ? void 0 : _a.forEach((filter) => {
@@ -5861,6 +5876,7 @@ class AdHocFiltersVariable extends SceneObjectBase {
     if (this._prevScopes.length) {
       this.setState({ originFilters: [...finalFilters, ...remainingFilters] });
       this._prevScopes = scopes;
+      this._debouncedVerifyApplicability();
       return;
     }
     const editedScopeFilters = scopeInjectedFilters.filter((filter) => filter.restorable);
@@ -5870,11 +5886,9 @@ class AdHocFiltersVariable extends SceneObjectBase {
       ...editedScopeFilters.filter((filter) => scopeFilterKeys.includes(filter.key)),
       ...scopeFilters.filter((filter) => !editedScopeFilterKeys.includes(filter.key))
     ];
-    this._setStateWithFiltersApplicabilityCheck({
-      filters: this.state.filters,
-      originFilters: [...finalFilters, ...remainingFilters]
-    });
+    this.setState({ originFilters: [...finalFilters, ...remainingFilters] });
     this._prevScopes = scopes;
+    this._debouncedVerifyApplicability();
   }
   setState(update) {
     var _a, _b;
@@ -5956,11 +5970,8 @@ class AdHocFiltersVariable extends SceneObjectBase {
     }
     if (filter === _wip) {
       if ("value" in update && update["value"] !== "") {
-        this._setStateWithFiltersApplicabilityCheck({
-          filters: [...filters, { ..._wip, ...update }],
-          originFilters: this.state.originFilters,
-          _wip: void 0
-        });
+        this.setState({ filters: [...filters, { ..._wip, ...update }], _wip: void 0 });
+        this._debouncedVerifyApplicability();
       } else {
         this.setState({ _wip: { ...filter, ...update } });
       }
@@ -5989,10 +6000,8 @@ class AdHocFiltersVariable extends SceneObjectBase {
     }
     const queryController = getQueryController(this);
     queryController == null ? void 0 : queryController.startProfile(FILTER_REMOVED_INTERACTION);
-    this._setStateWithFiltersApplicabilityCheck({
-      filters: this.state.filters.filter((f) => f !== filter),
-      originFilters: this.state.originFilters
-    });
+    this.setState({ filters: this.state.filters.filter((f) => f !== filter) });
+    this._debouncedVerifyApplicability();
   }
   _removeLastFilter() {
     const filterToRemove = this.state.filters.at(-1);
@@ -6048,20 +6057,20 @@ class AdHocFiltersVariable extends SceneObjectBase {
       });
     }
   }
-  async _setStateWithFiltersApplicabilityCheck(update) {
-    var _a, _b;
+  async _verifyApplicability() {
+    var _a, _b, _c;
+    const filters = [...this.state.filters, ...(_a = this.state.originFilters) != null ? _a : []];
     const ds = await this._dataSourceSrv.get(this.state.datasource, this._scopedVars);
     if (!ds || !ds.getFiltersApplicability) {
-      this.setState(update);
       return;
     }
-    if (!update.filters) {
+    if (!filters) {
       return;
     }
     const timeRange = sceneGraph.getTimeRange(this).state.value;
     const queries = this.state.useQueriesAsFilterForOptions ? getQueriesForVariables(this) : void 0;
     const response = await ds.getFiltersApplicability({
-      filters: [...update.filters, ...(_a = update.originFilters) != null ? _a : []],
+      filters,
       queries,
       timeRange,
       scopes: sceneGraph.getScopes(this),
@@ -6071,6 +6080,10 @@ class AdHocFiltersVariable extends SceneObjectBase {
     response.forEach((filter) => {
       responseMap.set(`${filter.key}${filter.origin ? `-${filter.origin}` : ""}`, filter);
     });
+    const update = {
+      filters: [...this.state.filters],
+      originFilters: [...(_b = this.state.originFilters) != null ? _b : []]
+    };
     update.filters.forEach((f) => {
       const filter = responseMap.get(f.key);
       if (filter) {
@@ -6078,7 +6091,7 @@ class AdHocFiltersVariable extends SceneObjectBase {
         f.nonApplicableReason = filter.reason;
       }
     });
-    (_b = update.originFilters) == null ? void 0 : _b.forEach((f) => {
+    (_c = update.originFilters) == null ? void 0 : _c.forEach((f) => {
       const filter = responseMap.get(`${f.key}-${f.origin}`);
       if (filter) {
         if (!f.matchAllFilter) {