@grafana/scenes 5.16.3--canary.927.11147932712.0 → 5.16.3

package/dist/index.js

@@ -3843,14 +3843,7 @@ const switchInputType = (filterInputType, setInputType, handleChangeViewMode, el
   handleChangeViewMode == null ? void 0 : handleChangeViewMode();
   setTimeout(() => element == null ? void 0 : element.focus());
 };
-const generateFilterUpdatePayload = ({
-  filterInputType,
-  item,
-  filter,
-  multiValueOperators,
-  setFilterMultiValues
-}) => {
-  var _a, _b, _c, _d, _e;
+const generateFilterUpdatePayload = (filterInputType, item) => {
   if (filterInputType === "key") {
     return {
       key: item.value,
@@ -3863,33 +3856,6 @@ const generateFilterUpdatePayload = ({
       valueLabels: [item.label ? item.label : item.value]
     };
   }
-  if (filterInputType === "operator") {
-    if (multiValueOperators.includes(filter.operator) && !multiValueOperators.includes(item.value)) {
-      setFilterMultiValues([]);
-      return {
-        operator: item.value,
-        valueLabels: [((_a = filter.valueLabels) == null ? void 0 : _a[0]) || ((_b = filter.values) == null ? void 0 : _b[0]) || filter.value],
-        values: void 0
-      };
-    }
-    if (multiValueOperators.includes(item.value) && !multiValueOperators.includes(filter.operator)) {
-      const valueLabels = [((_c = filter.valueLabels) == null ? void 0 : _c[0]) || ((_d = filter.values) == null ? void 0 : _d[0]) || filter.value];
-      const values = [filter.value];
-      if (values[0]) {
-        setFilterMultiValues([
-          {
-            value: values[0],
-            label: (_e = valueLabels == null ? void 0 : valueLabels[0]) != null ? _e : values[0]
-          }
-        ]);
-      }
-      return {
-        operator: item.value,
-        valueLabels,
-        values
-      };
-    }
-  }
   return {
     [filterInputType]: item.value
   };
@@ -4208,16 +4174,7 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
         if (multiValueEdit) {
           handleLocalMultiValueChange(selectedItem);
         } else {
-          model._updateFilter(
-            filter,
-            generateFilterUpdatePayload({
-              filterInputType,
-              item: selectedItem,
-              filter,
-              multiValueOperators,
-              setFilterMultiValues
-            })
-          );
+          model._updateFilter(filter, generateFilterUpdatePayload(filterInputType, selectedItem));
           switchToNextInputType(filterInputType, setInputType, handleChangeViewMode, refs.domReference.current);
           setActiveIndex(0);
         }
@@ -4230,7 +4187,6 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
       filterInputType,
       filteredDropDownItems,
       handleLocalMultiValueChange,
-      multiValueOperators,
       handleChangeViewMode,
       model,
       refs.domReference
@@ -4394,16 +4350,7 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
           handleLocalMultiValueChange(item);
           (_a3 = refs.domReference.current) == null ? void 0 : _a3.focus();
         } else {
-          model._updateFilter(
-            filter,
-            generateFilterUpdatePayload({
-              filterInputType,
-              item,
-              filter,
-              multiValueOperators,
-              setFilterMultiValues
-            })
-          );
+          model._updateFilter(filter, generateFilterUpdatePayload(filterInputType, item));
           setInputValue("");
           switchToNextInputType(
             filterInputType,
@@ -10889,18 +10836,18 @@ class SceneRefreshPicker extends SceneObjectBase {
     });
   }
   getUrlState() {
-    return {
-      refresh: this.state.refresh
-    };
+    let refresh = this.state.refresh;
+    if (typeof refresh !== "string" || refresh.length === 0) {
+      refresh = void 0;
+    }
+    return { refresh };
   }
   updateFromUrl(values) {
     const { intervals } = this.state;
-    const refresh = values.refresh;
-    if (refresh && typeof refresh === "string") {
+    let refresh = values.refresh;
+    if (typeof refresh === "string" && isIntervalString(refresh)) {
       if (intervals == null ? void 0 : intervals.includes(refresh)) {
-        this.setState({
-          refresh
-        });
+        this.setState({ refresh });
       } else {
         this.setState({
           refresh: intervals ? intervals[0] : void 0
@@ -10950,6 +10897,14 @@ function useQueryControllerState(model) {
   }
   return queryController.useState().isRunning;
 }
+function isIntervalString(str) {
+  try {
+    const res = data.rangeUtil.describeInterval(str);
+    return res.count > 0;
+  } catch (e) {
+    return false;
+  }
+}
 
 const getCompareSeriesRefId = (refId) => `${refId}-compare`;