@grafana/scenes 6.16.0--canary.1132.15279399049.0 → 6.16.0--canary.1134.15292037236.0

package/dist/index.js

@@ -3938,9 +3938,9 @@ class AdHocFiltersVariableUrlSyncHandler {
   }
   getUrlState() {
     const filters = this._variable.state.filters;
-    const originFilters = this._variable.state.originFilters;
+    const baseFilters = this._variable.state.baseFilters;
     let value = [];
-    if (filters.length === 0 && (originFilters == null ? void 0 : originFilters.length) === 0) {
+    if (filters.length === 0 && (baseFilters == null ? void 0 : baseFilters.length) === 0) {
       return { [this.getKey()]: [""] };
     }
     if (filters.length) {
@@ -3948,10 +3948,10 @@ class AdHocFiltersVariableUrlSyncHandler {
         ...filters.filter(isFilterComplete).filter((filter) => !filter.hidden).map((filter) => toArray(filter).map(escapeUrlPipeDelimiters).join("|"))
       );
     }
-    if (originFilters == null ? void 0 : originFilters.length) {
+    if (baseFilters == null ? void 0 : baseFilters.length) {
       value.push(
-        ...originFilters == null ? void 0 : originFilters.filter(isFilterComplete).filter((filter) => !filter.hidden && filter.origin && filter.restorable).map(
-          (filter) => toArray(filter).map(escapeOriginFilterUrlDelimiters).join("|").concat(`#${filter.origin}#restorable`)
+        ...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`)
         )
       );
     }
@@ -3965,35 +3965,31 @@ class AdHocFiltersVariableUrlSyncHandler {
       return;
     }
     const filters = deserializeUrlToFilters(urlValue);
-    const originFilters = updateOriginFilters([...this._variable.state.originFilters || []], filters);
+    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),
-      originFilters
+      baseFilters
     });
   }
 }
-function updateOriginFilters(prevOriginFilters, filters) {
-  const updatedOriginFilters = [...prevOriginFilters];
-  for (let i = 0; i < filters.length; i++) {
-    const foundOriginFilterIndex = prevOriginFilters.findIndex((f) => f.key === filters[i].key);
-    if (foundOriginFilterIndex > -1) {
-      if (!filters[i].origin && prevOriginFilters[foundOriginFilterIndex].origin === "dashboard") {
-        filters[i].origin = "dashboard";
-        filters[i].restorable = true;
-      }
-      if (isMatchAllFilter(filters[i])) {
-        filters[i].matchAllFilter = true;
-      }
-      updatedOriginFilters[foundOriginFilterIndex] = filters[i];
-    } else if (filters[i].origin === "dashboard") {
-      delete filters[i].origin;
-      delete filters[i].restorable;
-    } else if (foundOriginFilterIndex === -1 && filters[i].origin === "scope" && filters[i].restorable) {
-      updatedOriginFilters.push(filters[i]);
-    }
-  }
-  return updatedOriginFilters;
-}
 function deserializeUrlToFilters(value) {
   if (Array.isArray(value)) {
     const values = value;
@@ -5321,7 +5317,7 @@ const AdHocFiltersAlwaysWipCombobox = React.forwardRef(function AdHocFiltersAlwa
 });
 
 const AdHocFiltersComboboxRenderer = React.memo(function AdHocFiltersComboboxRenderer2({ model }) {
-  const { originFilters, filters, readOnly } = model.useState();
+  const { baseFilters, filters, readOnly } = model.useState();
   const styles = ui.useStyles2(getStyles$a);
   const focusOnWipInputRef = React.useRef();
   return /* @__PURE__ */ React__default.default.createElement(
@@ -5334,7 +5330,7 @@ const AdHocFiltersComboboxRenderer = React.memo(function AdHocFiltersComboboxRen
       }
     },
     /* @__PURE__ */ React__default.default.createElement(ui.Icon, { name: "filter", className: styles.filterIcon, size: "lg" }),
-    originFilters == null ? void 0 : originFilters.map(
+    baseFilters == null ? void 0 : baseFilters.map(
       (filter, index) => filter.origin ? /* @__PURE__ */ React__default.default.createElement(
         AdHocFilterPill,
         {
@@ -5498,14 +5494,17 @@ 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",
       filters: [],
       datasource: null,
       applyMode: "auto",
-      filterExpression: (_d = state.filterExpression) != null ? _d : renderExpression(state.expressionBuilder, [...(_b = state.originFilters) != null ? _b : [], ...(_c = state.filters) != null ? _c : []]),
+      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) };
@@ -5514,7 +5513,6 @@ class AdHocFiltersVariable extends SceneObjectBase {
     // 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._prevScopes = [];
     /** Needed for scopes dependency */
     this._variableDependency = new VariableDependencyConfig(this, {
       dependsOnScopes: true,
@@ -5522,33 +5520,44 @@ class AdHocFiltersVariable extends SceneObjectBase {
     });
     this._urlSync = new AdHocFiltersVariableUrlSyncHandler(this);
     this._activationHandler = () => {
+      this._updateScopesFilters();
       return () => {
-        var _a;
-        (_a = this.state.originFilters) == null ? void 0 : _a.forEach((filter) => {
-          if (filter.restorable) {
-            this.restoreOriginalFilter(filter);
-          }
-        });
+        var _a, _b;
+        if ((_a = this.state.baseFilters) == null ? void 0 : _a.length) {
+          this.setState({
+            baseFilters: [...this.state.baseFilters.filter((filter) => filter.origin !== "scope")]
+          });
+          (_b = this.state.baseFilters) == null ? void 0 : _b.forEach((filter) => {
+            if (filter.origin === "dashboard" && filter.restorable) {
+              this.restoreOriginalFilter(filter);
+            }
+          });
+        }
       };
     };
     if (this.state.applyMode === "auto") {
       patchGetAdhocFilters(this);
     }
-    (_e = this.state.originFilters) == null ? void 0 : _e.forEach((filter) => {
+    (_f = this.state.baseFilters) == null ? void 0 : _f.forEach((baseFilter) => {
       var _a2;
-      this._originalValues.set(filter.key, {
-        operator: filter.operator,
-        value: (_a2 = filter.values) != null ? _a2 : [filter.value]
-      });
+      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() {
     var _a, _b;
     const scopes = sceneGraph.getScopes(this);
-    if (!scopes || !scopes.length) {
+    if (!scopes) {
+      return;
+    }
+    if (!scopes.length) {
       this.setState({
-        originFilters: (_a = this.state.originFilters) == null ? void 0 : _a.filter((filter) => filter.origin !== "scope")
+        baseFilters: (_a = this.state.baseFilters) == null ? void 0 : _a.filter((filter) => filter.origin !== "scope")
       });
       return;
     }
@@ -5566,18 +5575,13 @@ class AdHocFiltersVariable extends SceneObjectBase {
         operator: scopeFilter.operator
       });
     });
-    (_b = this.state.originFilters) == null ? void 0 : _b.forEach((filter) => {
+    (_b = this.state.baseFilters) == null ? void 0 : _b.forEach((filter) => {
       if (filter.origin === "scope") {
         scopeInjectedFilters.push(filter);
       } else {
         remainingFilters.push(filter);
       }
     });
-    if (this._prevScopes.length) {
-      this.setState({ originFilters: [...finalFilters, ...remainingFilters] });
-      this._prevScopes = scopes;
-      return;
-    }
     const editedScopeFilters = scopeInjectedFilters.filter((filter) => filter.restorable);
     const editedScopeFilterKeys = editedScopeFilters.map((filter) => filter.key);
     const scopeFilterKeys = scopeFilters.map((filter) => filter.key);
@@ -5585,16 +5589,18 @@ class AdHocFiltersVariable extends SceneObjectBase {
       ...editedScopeFilters.filter((filter) => scopeFilterKeys.includes(filter.key)),
       ...scopeFilters.filter((filter) => !editedScopeFilterKeys.includes(filter.key))
     ];
-    this.setState({ originFilters: [...finalFilters, ...remainingFilters] });
-    this._prevScopes = scopes;
+    this.setState({ baseFilters: [...finalFilters, ...remainingFilters] });
   }
   setState(update) {
-    var _a, _b;
+    var _a, _b, _c;
     let filterExpressionChanged = false;
-    if ((update.filters && update.filters !== this.state.filters || update.originFilters && update.originFilters !== this.state.originFilters) && !update.filterExpression) {
+    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 originFilters = (_b = update.originFilters) != null ? _b : this.state.originFilters;
-      update.filterExpression = renderExpression(this.state.expressionBuilder, [...originFilters != null ? originFilters : [], ...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);
@@ -5608,12 +5614,12 @@ class AdHocFiltersVariable extends SceneObjectBase {
    * allowing consumers to update the filters without triggering dependent data providers.
    */
   updateFilters(filters, options) {
-    var _a;
+    var _a, _b;
     let filterExpressionChanged = false;
     let filterExpression = void 0;
     if (filters && filters !== this.state.filters) {
       filterExpression = renderExpression(this.state.expressionBuilder, [
-        ...(_a = this.state.originFilters) != null ? _a : [],
+        ...(_b = (_a = this.state.baseFilters) == null ? void 0 : _a.filter((filter) => filter.origin)) != null ? _b : [],
         ...filters
       ]);
       filterExpressionChanged = filterExpression !== this.state.filterExpression;
@@ -5633,34 +5639,32 @@ class AdHocFiltersVariable extends SceneObjectBase {
     };
     if (filter.restorable) {
       const originalFilter = this._originalValues.get(filter.key);
-      if (!originalFilter) {
-        return;
-      }
       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);
     }
+    this._updateFilter(filter, original);
   }
   getValue() {
     return this.state.filterExpression;
   }
   _updateFilter(filter, update) {
     var _a;
-    const { originFilters, filters, _wip } = this.state;
+    const { baseFilters, filters, _wip } = this.state;
     if (filter.origin) {
       const originalValues = this._originalValues.get(filter.key);
       const updateValues = update.values || (update.value ? [update.value] : void 0);
-      if (updateValues && !lodash.isEqual(updateValues, originalValues == null ? void 0 : originalValues.value) || update.operator && update.operator !== (originalValues == null ? void 0 : originalValues.operator)) {
+      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 updatedFilters2 = (_a = originFilters == null ? void 0 : originFilters.map((f) => {
+      const updatedBaseFilters = (_a = baseFilters == null ? void 0 : baseFilters.map((f) => {
         return f === filter ? { ...f, ...update } : f;
       })) != null ? _a : [];
-      this.setState({ originFilters: updatedFilters2 });
+      this.setState({ baseFilters: updatedBaseFilters });
       return;
     }
     if (filter === _wip) {
@@ -5723,13 +5727,13 @@ class AdHocFiltersVariable extends SceneObjectBase {
           return [...acc, f];
         }, [])
       });
-    } else if ((_a = this.state.originFilters) == null ? void 0 : _a.length) {
-      let filterToForceIndex = this.state.originFilters.length - 1;
+    } 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({
-        originFilters: this.state.originFilters.reduce((acc, f, index) => {
+        baseFilters: this.state.baseFilters.reduce((acc, f, index) => {
           if (index === filterToForceIndex && !f.readOnly) {
             return [
               ...acc,
@@ -5799,8 +5803,8 @@ class AdHocFiltersVariable extends SceneObjectBase {
     if (!ds || !ds.getTagValues) {
       return [];
     }
-    const originFilters = (_d = (_c = this.state.originFilters) == null ? void 0 : _c.filter((f) => f.key !== filter.key)) != null ? _d : [];
-    const otherFilters = this.state.filters.filter((f) => f.key !== filter.key).concat(originFilters);
+    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 = sceneGraph.getScopes(this);
@@ -6284,10 +6288,12 @@ class SceneQueryRunner extends SceneObjectBase {
       ...getEnrichedDataRequest(this)
     };
     if (this._adhocFiltersVar) {
-      request.filters = [
-        ...(_a = this._adhocFiltersVar.state.originFilters) != null ? _a : [],
-        ...this._adhocFiltersVar.state.filters
-      ].filter(isFilterComplete);
+      request.filters = [];
+      if ((_a = this._adhocFiltersVar.state.baseFilters) == null ? void 0 : _a.length) {
+        const injectedBaseFilters = this._adhocFiltersVar.state.baseFilters.filter((filter) => filter.origin);
+        request.filters = request.filters.concat(injectedBaseFilters);
+      }
+      request.filters = request.filters.concat(this._adhocFiltersVar.state.filters.filter(isFilterComplete));
     }
     if (this._groupByVar) {
       request.groupByKeys = this._groupByVar.state.value;
@@ -6524,7 +6530,7 @@ function escapeUrlHashDelimiters(value) {
   }
   return /#/g[Symbol.replace](value, "__gfh__");
 }
-function escapeOriginFilterUrlDelimiters(value) {
+function escapeInjectedFilterUrlDelimiters(value) {
   return escapeUrlHashDelimiters(escapeUrlPipeDelimiters(value));
 }
 function escapeURLDelimiters(value) {
@@ -7285,9 +7291,11 @@ class ScopesVariable extends SceneObjectBase {
     const loading = state.value.length === 0 ? false : state.loading;
     const oldScopes = this.state.scopes.map((scope) => scope.metadata.name);
     const newScopes = state.value.map((scope) => scope.metadata.name);
-    this.setState({ scopes: state.value, loading });
     if (!loading && !lodash.isEqual(oldScopes, newScopes)) {
+      this.setState({ scopes: state.value, loading });
       this.publishEvent(new SceneVariableValueChangedEvent(this), true);
+    } else {
+      this.setState({ loading });
     }
   }
 }