@grafana/scenes 6.28.2--canary.1196.16518846434.0 → 6.28.2--canary.1195.16567768943.0

package/dist/index.js

@@ -646,7 +646,7 @@ class SceneRenderProfiler {
         );
         __privateSet$3(this, _trailAnimationFrameId, null);
         const profileEndTs = profileStartTs + profileDuration + slowFramesTime;
-        performance.measure("DashboardInteraction", {
+        performance.measure(`DashboardInteraction ${__privateGet$3(this, _profileInProgress).origin}`, {
           start: profileStartTs,
           end: profileEndTs
         });
@@ -664,6 +664,7 @@ class SceneRenderProfiler {
             // @ts-ignore
             totalJSHeapSize: performance.memory ? performance.memory.totalJSHeapSize : 0
           });
+          __privateSet$3(this, _profileInProgress, null);
         }
         if (window.__runs) {
           window.__runs += `${Date.now()}, ${profileDuration + slowFramesTime}
@@ -676,14 +677,22 @@ class SceneRenderProfiler {
     };
   }
   startProfile(name) {
-    if (__privateGet$3(this, _trailAnimationFrameId)) {
-      cancelAnimationFrame(__privateGet$3(this, _trailAnimationFrameId));
-      __privateSet$3(this, _trailAnimationFrameId, null);
-      writeSceneLog(this.constructor.name, "New profile: Stopped recording frames");
+    if (__privateGet$3(this, _profileInProgress)) {
+      if (__privateGet$3(this, _trailAnimationFrameId)) {
+        cancelAnimationFrame(__privateGet$3(this, _trailAnimationFrameId));
+        __privateSet$3(this, _trailAnimationFrameId, null);
+        writeSceneLog(this.constructor.name, "New profile: Stopped recording frames ");
+        __privateSet$3(this, _profileInProgress, { origin: name, crumbs: [] });
+        __privateSet$3(this, _profileStartTs, performance.now());
+        writeSceneLog(this.constructor.name, "Profile started:", __privateGet$3(this, _profileInProgress), __privateGet$3(this, _profileStartTs));
+      } else {
+        this.addCrumb(name);
+      }
+    } else {
+      __privateSet$3(this, _profileInProgress, { origin: name, crumbs: [] });
+      __privateSet$3(this, _profileStartTs, performance.now());
+      writeSceneLog(this.constructor.name, "Profile started:", __privateGet$3(this, _profileInProgress), __privateGet$3(this, _profileStartTs));
     }
-    __privateSet$3(this, _profileInProgress, { origin: name, crumbs: [] });
-    __privateSet$3(this, _profileStartTs, performance.now());
-    writeSceneLog(this.constructor.name, "Profile started:", __privateGet$3(this, _profileInProgress), __privateGet$3(this, _profileStartTs));
   }
   recordProfileTail(measurementStartTime, profileStartTs) {
     __privateSet$3(this, _trailAnimationFrameId, requestAnimationFrame(
@@ -709,6 +718,7 @@ class SceneRenderProfiler {
   }
   addCrumb(crumb) {
     if (__privateGet$3(this, _profileInProgress)) {
+      writeSceneLog(this.constructor.name, "Adding crumb:", crumb);
       __privateGet$3(this, _profileInProgress).crumbs.push(crumb);
     }
   }
@@ -757,6 +767,13 @@ function calculateNetworkTime(requests) {
   totalNetworkTime += currentEnd - currentStart;
   return totalNetworkTime;
 }
+const REFRESH_INTERACTION = "refresh";
+const TIME_RANGE_CHANGE_INTERACTION = "time_range_change";
+const FILTER_REMOVED_INTERACTION = "filter_removed";
+const FILTER_CHANGED_INTERACTION = "filter_changed";
+const FILTER_RESTORED_INTERACTION = "filter_restored";
+const VARIABLE_VALUE_CHANGED_INTERACTION = "variable_value_changed";
+const SCOPES_CHANGED_INTERACTION = "scopes_changed";
 
 var __typeError$2 = (msg) => {
   throw TypeError(msg);
@@ -1038,7 +1055,7 @@ class SceneTimeRange extends SceneObjectBase {
       );
       if (update.from !== this.state.from || update.to !== this.state.to) {
         const queryController = getQueryController(this);
-        queryController == null ? void 0 : queryController.startProfile("SceneTimeRange");
+        queryController == null ? void 0 : queryController.startProfile(TIME_RANGE_CHANGE_INTERACTION);
         this._urlSync.performBrowserHistoryAction(() => {
           this.setState(update);
         });
@@ -2401,21 +2418,13 @@ const macrosIndex = /* @__PURE__ */ new Map([
   ["__interval", IntervalMacro],
   ["__interval_ms", IntervalMacro]
 ]);
-function registerVariableMacro(name, macro, replace = false) {
-  if (macrosIndex.get(name) && !replace) {
+function registerVariableMacro(name, macro) {
+  if (macrosIndex.get(name)) {
     throw new Error(`Macro already registered ${name}`);
   }
-  let replacedMacro;
-  if (macrosIndex.has(name) && !replace) {
-    replacedMacro = macrosIndex.get(name);
-  }
   macrosIndex.set(name, macro);
   return () => {
-    if (replacedMacro) {
-      macrosIndex.set(name, replacedMacro);
-    } else {
-      macrosIndex.delete(name);
-    }
+    macrosIndex.delete(name);
   };
 }
 
@@ -2561,6 +2570,7 @@ function wrapPromiseInStateObservable(promise) {
 }
 
 async function getDataSource(datasource, scopedVars) {
+  var _a;
   if (datasource == null ? void 0 : datasource.uid) {
     const runtimeDataSource = runtimeDataSources.get(datasource.uid);
     if (runtimeDataSource) {
@@ -2576,7 +2586,7 @@ async function getDataSource(datasource, scopedVars) {
     if (queryControler && queryControler.state.enableProfiling) {
       wrapPromiseInStateObservable(dsPromise).pipe(
         registerQueryWithController({
-          type: "plugin",
+          type: `plugin/${(_a = datasource == null ? void 0 : datasource.type) != null ? _a : "unknown"}`,
           origin: scopedVars.__sceneObject.value.valueOf()
         })
       ).subscribe(() => {
@@ -2918,7 +2928,7 @@ function VariableValueSelect({ model, state }) {
       "data-testid": e2eSelectors.selectors.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts(`${value}`),
       onChange: (newValue) => {
         model.changeValueTo(newValue.value, newValue.label, true);
-        queryController == null ? void 0 : queryController.startProfile("VariableValueSelect");
+        queryController == null ? void 0 : queryController.startProfile(VARIABLE_VALUE_CHANGED_INTERACTION);
         if (hasCustomValue !== newValue.__isNew__) {
           setHasCustomValue(newValue.__isNew__);
         }
@@ -2991,7 +3001,7 @@ function VariableValueSelectMulti({
       onInputChange,
       onBlur: () => {
         model.changeValueTo(uncommittedValue, void 0, true);
-        queryController == null ? void 0 : queryController.startProfile("VariableValueSelectMulti");
+        queryController == null ? void 0 : queryController.startProfile(VARIABLE_VALUE_CHANGED_INTERACTION);
       },
       filterOption: filterNoOp$2,
       "data-testid": e2eSelectors.selectors.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts(`${uncommittedValue}`),
@@ -4634,6 +4644,14 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
           valueLabels.push((_a2 = item.label) != null ? _a2 : item.value);
           values.push(item.value);
         });
+        let shouldUpdate = true;
+        if (Array.isArray(filter2.values) && filter2.values.length === values.length) {
+          shouldUpdate = !filter2.values.every((v, i) => v === values[i]);
+        }
+        if (shouldUpdate) {
+          const queryController = getQueryController(model2);
+          queryController == null ? void 0 : queryController.startProfile(FILTER_CHANGED_INTERACTION);
+        }
         model2._updateFilter(filter2, { valueLabels, values, value: values[0] });
         setFilterMultiValues([]);
       }
@@ -4786,6 +4804,10 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
           return;
         }
         focusOnWipInputRef == null ? void 0 : focusOnWipInputRef();
+        if (isFilterComplete(filter)) {
+          const queryController = getQueryController(model);
+          queryController == null ? void 0 : queryController.startProfile(FILTER_REMOVED_INTERACTION);
+        }
         model._handleComboboxBackspace(filter);
         if (isAlwaysWip) {
           handleResetWip();
@@ -4850,16 +4872,18 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
           handleLocalMultiValueChange(selectedItem);
           setInputValue("");
         } else {
-          model._updateFilter(
+          const payload = generateFilterUpdatePayload({
+            filterInputType,
+            item: selectedItem,
             filter,
-            generateFilterUpdatePayload({
-              filterInputType,
-              item: selectedItem,
-              filter,
-              setFilterMultiValues,
-              onAddCustomValue
-            })
-          );
+            setFilterMultiValues,
+            onAddCustomValue
+          });
+          if (filterInputType === "value" && payload.value !== (filter == null ? void 0 : filter.value)) {
+            const queryController = getQueryController(model);
+            queryController == null ? void 0 : queryController.startProfile(FILTER_CHANGED_INTERACTION);
+          }
+          model._updateFilter(filter, payload);
           populateInputValueOnInputTypeSwitch({
             populateInputOnEdit,
             item: selectedItem,
@@ -5107,16 +5131,18 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
                     setInputValue("");
                     (_a3 = refs.domReference.current) == null ? void 0 : _a3.focus();
                   } else {
-                    model._updateFilter(
+                    const payload = generateFilterUpdatePayload({
+                      filterInputType,
+                      item,
                       filter,
-                      generateFilterUpdatePayload({
-                        filterInputType,
-                        item,
-                        filter,
-                        setFilterMultiValues,
-                        onAddCustomValue
-                      })
-                    );
+                      setFilterMultiValues,
+                      onAddCustomValue
+                    });
+                    if (filterInputType === "value" && payload.value !== (filter == null ? void 0 : filter.value)) {
+                      const queryController = getQueryController(model);
+                      queryController == null ? void 0 : queryController.startProfile(FILTER_CHANGED_INTERACTION);
+                    }
+                    model._updateFilter(filter, payload);
                     populateInputValueOnInputTypeSwitch({
                       populateInputOnEdit,
                       item,
@@ -5842,6 +5868,8 @@ class AdHocFiltersVariable extends SceneObjectBase {
       original.valueLabels = originalFilter == null ? void 0 : originalFilter.value;
       original.operator = originalFilter == null ? void 0 : originalFilter.operator;
       original.nonApplicable = originalFilter == null ? void 0 : originalFilter.nonApplicable;
+      const queryController = getQueryController(this);
+      queryController == null ? void 0 : queryController.startProfile(FILTER_RESTORED_INTERACTION);
       this._updateFilter(filter, original);
     }
   }
@@ -5898,6 +5926,8 @@ class AdHocFiltersVariable extends SceneObjectBase {
       this.setState({ _wip: void 0 });
       return;
     }
+    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
@@ -7540,6 +7570,8 @@ class ScopesVariable extends SceneObjectBase {
     const newScopes = state.value.map((scope) => scope.metadata.name);
     const scopesHaveChanged = !lodash.isEqual(oldScopes, newScopes);
     if (!loading && (scopesHaveChanged || newScopes.length === 0)) {
+      const queryController = getQueryController(this);
+      queryController == null ? void 0 : queryController.startProfile(SCOPES_CHANGED_INTERACTION);
       this.setState({ scopes: state.value, loading });
       this.publishEvent(new SceneVariableValueChangedEvent(this), true);
     } else {
@@ -8656,7 +8688,7 @@ class VizPanel extends SceneObjectBase {
         const panelPromise = importPanelPlugin(pluginId);
         const queryControler = sceneGraph.getQueryController(this);
         if (queryControler && queryControler.state.enableProfiling) {
-          wrapPromiseInStateObservable(panelPromise).pipe(registerQueryWithController({ type: "plugin", origin: this })).subscribe(() => {
+          wrapPromiseInStateObservable(panelPromise).pipe(registerQueryWithController({ type: `plugin/${pluginId}`, origin: this })).subscribe(() => {
           });
         }
         const result = await panelPromise;
@@ -12023,7 +12055,7 @@ class SceneRefreshPicker extends SceneObjectBase {
     this._autoRefreshBlocked = false;
     this.onRefresh = () => {
       const queryController = sceneGraph.getQueryController(this);
-      queryController == null ? void 0 : queryController.startProfile("SceneRefreshPicker");
+      queryController == null ? void 0 : queryController.startProfile(REFRESH_INTERACTION);
       if (queryController == null ? void 0 : queryController.state.isRunning) {
         queryController.cancelAll();
         return;
@@ -12080,7 +12112,7 @@ class SceneRefreshPicker extends SceneObjectBase {
       this._intervalTimer = setInterval(() => {
         if (this.isTabVisible()) {
           const queryController = sceneGraph.getQueryController(this);
-          queryController == null ? void 0 : queryController.startProfile("SceneRefreshPicker");
+          queryController == null ? void 0 : queryController.startProfile(REFRESH_INTERACTION);
           timeRange.onRefresh();
         } else {
           this._autoRefreshBlocked = true;