@grafana/scenes 6.4.0--canary.1062.13832864605.0 → 6.4.0--canary.1062.13918541857.0

package/dist/index.js

@@ -4720,6 +4720,9 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
               return;
             }
           }
+          if (filter == null ? void 0 : filter.origin) {
+            return;
+          }
           setInputType("operator");
           return;
         }
@@ -4915,9 +4918,10 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
       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();
@@ -4925,6 +4929,9 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
       switchInputType("operator", setInputType, void 0, refs.domReference.current);
     },
     onKeyDown: (event) => {
+      if (filter.origin) {
+        return;
+      }
       handleShiftTabInput(event, hasMultiValueOperator);
       if (event.key === "Enter") {
         setInputValue("");
@@ -5580,7 +5587,7 @@ class AdHocFiltersVariable extends SceneObjectBase {
           ...scopeFilters.filter((filter) => !editedScopeFilterKeys.includes(filter.key))
         ];
       }
-      const newFilters = [...finalFilters, ...remainingFilters];
+      const newFilters = [...remainingFilters, ...finalFilters];
       this.setState({ baseFilters: newFilters });
     };
     if (this.state.applyMode === "auto") {
@@ -5685,6 +5692,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) {
@@ -5706,6 +5714,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) {
@@ -5744,7 +5773,7 @@ class AdHocFiltersVariable extends SceneObjectBase {
     return keys.map(toSelectableValue);
   }
   async _getValuesFor(filter) {
-    var _a, _b, _c, _d, _e, _f;
+    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);
@@ -5758,16 +5787,11 @@ 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 ((_f = this.state.baseFilters) == null ? void 0 : _f.some((filter2) => filter2.origin === "scopes" /* Scopes */)) {
+    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) => {
-                var _a2;
-                return !((_a2 = this.state.baseFilters) == null ? void 0 : _a2.find((bf) => bf.key === f.key && "scopes" /* Scopes */));
-              }
-            )
+            filters: scope.spec.filters.filter((f) => f.key !== filter.key)
           })
         });
       });