@perses-dev/plugin-system 0.53.0-beta.1 → 0.53.0-beta.2

package/dist/runtime/TimeRangeProvider/TimeRangeProvider.js

@@ -13,6 +13,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import React, { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { isRelativeTimeRange, toAbsoluteTimeRange, getSuggestedStepMs } from '@perses-dev/core';
+import { useQueryClient } from '@tanstack/react-query';
 import { getRefreshIntervalInMs } from './refresh-interval';
 export const TimeRangeContext = /*#__PURE__*/ createContext(undefined);
 export function useTimeRangeContext() {
@@ -38,62 +39,98 @@ export function useTimeRangeContext() {
  * Provider implementation that supplies the time range state at runtime.
  */ export function TimeRangeProvider(props) {
     const { timeRange, refreshInterval, children, setTimeRange, setRefreshInterval } = props;
-    /**
-   * TODO: The hook needs refactor. There is a bug here with refreshKey. If the refreshInterval is not set,
-   * refreshKey string includes an undefined xx:yy:zz:undefined:0
-   * I think exposing refresh functionality also is very risky. A careless usage of refresh may cause
-   * infinite rendering loop.
-   */ const [localTimeRange, setLocalTimeRange] = useState(timeRange);
-    const [localRefreshInterval, setLocalRefreshInterval] = useState(refreshInterval);
-    const [refreshCounter, setRefreshCounter] = useState(0);
-    useEffect(()=>{
-        setLocalTimeRange(timeRange);
+    const queryClient = useQueryClient();
+    const [absoluteTimeRange, setAbsoluteTimeRange] = useState(isRelativeTimeRange(timeRange) ? toAbsoluteTimeRange(timeRange) : timeRange);
+    const handleSetTimeRange = useCallback((value)=>{
+        setTimeRange(value);
+        setAbsoluteTimeRange(isRelativeTimeRange(value) ? toAbsoluteTimeRange(value) : value);
     }, [
-        timeRange,
-        refreshCounter
+        setTimeRange
     ]);
-    useEffect(()=>{
-        setLocalRefreshInterval(refreshInterval);
+    // Refresh is called when clicking on the refresh button, it refreshes all queries including variables
+    const refresh = useCallback(()=>{
+        setAbsoluteTimeRange(isRelativeTimeRange(timeRange) ? toAbsoluteTimeRange(timeRange) : timeRange);
+        queryClient.invalidateQueries({
+            queryKey: [
+                'query'
+            ]
+        }).finally(()=>queryClient.removeQueries({
+                queryKey: [
+                    'query'
+                ],
+                type: 'inactive'
+            }));
+        queryClient.invalidateQueries({
+            queryKey: [
+                'variable'
+            ]
+        }).finally(()=>queryClient.removeQueries({
+                queryKey: [
+                    'variable'
+                ],
+                type: 'inactive'
+            }));
     }, [
-        refreshInterval
+        queryClient,
+        timeRange
     ]);
-    const refresh = useCallback(()=>{
-        setRefreshCounter((counter)=>counter + 1);
+    // Auto refresh is only refreshing queries of panels
+    const autoRefresh = useCallback(()=>{
+        setAbsoluteTimeRange(isRelativeTimeRange(timeRange) ? toAbsoluteTimeRange(timeRange) : timeRange);
+        queryClient.invalidateQueries({
+            queryKey: [
+                'query'
+            ]
+        }).finally(()=>{
+            queryClient.removeQueries({
+                queryKey: [
+                    'query'
+                ],
+                type: 'inactive'
+            });
+            queryClient.removeQueries({
+                queryKey: [
+                    'variable'
+                ],
+                type: 'inactive'
+            }); // Timerange is in queryKey, can lead to memory leak when using relative timerange
+        });
     }, [
-        setRefreshCounter
+        queryClient,
+        timeRange
+    ]);
+    const refreshIntervalInMs = useMemo(()=>getRefreshIntervalInMs(refreshInterval), [
+        refreshInterval
     ]);
-    const refreshIntervalInMs = getRefreshIntervalInMs(localRefreshInterval);
     useEffect(()=>{
         if (refreshIntervalInMs > 0) {
             const interval = setInterval(()=>{
-                refresh();
+                autoRefresh();
             }, refreshIntervalInMs);
             return ()=>clearInterval(interval);
         }
     }, [
-        refresh,
+        autoRefresh,
         refreshIntervalInMs
     ]);
     const ctx = useMemo(()=>{
-        const absoluteTimeRange = isRelativeTimeRange(localTimeRange) ? toAbsoluteTimeRange(localTimeRange) : localTimeRange;
         return {
-            timeRange: localTimeRange,
-            setTimeRange: setTimeRange ?? setLocalTimeRange,
-            absoluteTimeRange,
+            timeRange: timeRange,
+            setTimeRange: handleSetTimeRange,
+            absoluteTimeRange: absoluteTimeRange,
             refresh,
-            refreshKey: `${absoluteTimeRange.start}:${absoluteTimeRange.end}:${localRefreshInterval}:${refreshCounter}`,
-            refreshInterval: localRefreshInterval,
+            refreshInterval: refreshInterval,
             refreshIntervalInMs: refreshIntervalInMs,
-            setRefreshInterval: setRefreshInterval ?? setLocalRefreshInterval
+            setRefreshInterval: setRefreshInterval
         };
     }, [
-        localTimeRange,
-        setTimeRange,
+        absoluteTimeRange,
+        handleSetTimeRange,
         refresh,
-        localRefreshInterval,
-        refreshCounter,
+        refreshInterval,
         refreshIntervalInMs,
-        setRefreshInterval
+        setRefreshInterval,
+        timeRange
     ]);
     return /*#__PURE__*/ _jsx(TimeRangeContext.Provider, {
         value: ctx,

package/dist/runtime/TimeRangeProvider/TimeRangeProvider.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/runtime/TimeRangeProvider/TimeRangeProvider.tsx"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport React, { createContext, ReactElement, useCallback, useContext, useEffect, useMemo, useState } from 'react';\nimport {\n  AbsoluteTimeRange,\n  DurationString,\n  TimeRangeValue,\n  isRelativeTimeRange,\n  toAbsoluteTimeRange,\n  getSuggestedStepMs,\n} from '@perses-dev/core';\nimport { getRefreshIntervalInMs } from './refresh-interval';\n\nexport interface TimeRangeProviderProps {\n  timeRange: TimeRangeValue;\n  refreshInterval?: DurationString;\n  setTimeRange?: (value: TimeRangeValue) => void;\n  setRefreshInterval?: (value: DurationString) => void;\n  children?: React.ReactNode;\n}\n\nexport interface TimeRange {\n  timeRange: TimeRangeValue;\n  absoluteTimeRange: AbsoluteTimeRange; // resolved absolute time for plugins to use\n  setTimeRange: (value: TimeRangeValue) => void;\n  refresh: () => void;\n  refreshKey: string;\n  refreshInterval?: DurationString;\n  refreshIntervalInMs: number;\n  setRefreshInterval: (value: DurationString) => void;\n}\n\nexport const TimeRangeContext = createContext<TimeRange | undefined>(undefined);\n\nexport function useTimeRangeContext(): TimeRange {\n  const ctx = useContext(TimeRangeContext);\n  if (ctx === undefined) {\n    throw new Error('No TimeRangeContext found. Did you forget a Provider?');\n  }\n  return ctx;\n}\n\n/**\n * Get and set the current resolved time range at runtime.\n */\nexport function useTimeRange(): TimeRange {\n  return useTimeRangeContext();\n}\n\n/**\n * Gets the suggested step for a graph query in ms for the currently selected time range.\n */\nexport function useSuggestedStepMs(width?: number): number {\n  const { absoluteTimeRange } = useTimeRange();\n  if (width === undefined) return 0;\n  return getSuggestedStepMs(absoluteTimeRange, width);\n}\n\n/**\n * Provider implementation that supplies the time range state at runtime.\n */\nexport function TimeRangeProvider(props: TimeRangeProviderProps): ReactElement {\n  const { timeRange, refreshInterval, children, setTimeRange, setRefreshInterval } = props;\n\n  /**\n   * TODO: The hook needs refactor. There is a bug here with refreshKey. If the refreshInterval is not set,\n   * refreshKey string includes an undefined xx:yy:zz:undefined:0\n   * I think exposing refresh functionality also is very risky. A careless usage of refresh may cause\n   * infinite rendering loop.\n   */\n\n  const [localTimeRange, setLocalTimeRange] = useState<TimeRangeValue>(timeRange);\n  const [localRefreshInterval, setLocalRefreshInterval] = useState<DurationString | undefined>(refreshInterval);\n\n  const [refreshCounter, setRefreshCounter] = useState(0);\n\n  useEffect(() => {\n    setLocalTimeRange(timeRange);\n  }, [timeRange, refreshCounter]);\n\n  useEffect(() => {\n    setLocalRefreshInterval(refreshInterval);\n  }, [refreshInterval]);\n\n  const refresh = useCallback(() => {\n    setRefreshCounter((counter) => counter + 1);\n  }, [setRefreshCounter]);\n\n  const refreshIntervalInMs = getRefreshIntervalInMs(localRefreshInterval);\n  useEffect(() => {\n    if (refreshIntervalInMs > 0) {\n      const interval = setInterval(() => {\n        refresh();\n      }, refreshIntervalInMs);\n\n      return (): void => clearInterval(interval);\n    }\n  }, [refresh, refreshIntervalInMs]);\n\n  const ctx = useMemo(() => {\n    const absoluteTimeRange = isRelativeTimeRange(localTimeRange)\n      ? toAbsoluteTimeRange(localTimeRange)\n      : localTimeRange;\n    return {\n      timeRange: localTimeRange,\n      setTimeRange: setTimeRange ?? setLocalTimeRange,\n      absoluteTimeRange,\n      refresh,\n      refreshKey: `${absoluteTimeRange.start}:${absoluteTimeRange.end}:${localRefreshInterval}:${refreshCounter}`,\n      refreshInterval: localRefreshInterval,\n      refreshIntervalInMs: refreshIntervalInMs,\n      setRefreshInterval: setRefreshInterval ?? setLocalRefreshInterval,\n    };\n  }, [\n    localTimeRange,\n    setTimeRange,\n    refresh,\n    localRefreshInterval,\n    refreshCounter,\n    refreshIntervalInMs,\n    setRefreshInterval,\n  ]);\n\n  return <TimeRangeContext.Provider value={ctx}>{children}</TimeRangeContext.Provider>;\n}\n"],"names":["React","createContext","useCallback","useContext","useEffect","useMemo","useState","isRelativeTimeRange","toAbsoluteTimeRange","getSuggestedStepMs","getRefreshIntervalInMs","TimeRangeContext","undefined","useTimeRangeContext","ctx","Error","useTimeRange","useSuggestedStepMs","width","absoluteTimeRange","TimeRangeProvider","props","timeRange","refreshInterval","children","setTimeRange","setRefreshInterval","localTimeRange","setLocalTimeRange","localRefreshInterval","setLocalRefreshInterval","refreshCounter","setRefreshCounter","refresh","counter","refreshIntervalInMs","interval","setInterval","clearInterval","refreshKey","start","end","Provider","value"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;AAEjC,OAAOA,SAASC,aAAa,EAAgBC,WAAW,EAAEC,UAAU,EAAEC,SAAS,EAAEC,OAAO,EAAEC,QAAQ,QAAQ,QAAQ;AAClH,SAIEC,mBAAmB,EACnBC,mBAAmB,EACnBC,kBAAkB,QACb,mBAAmB;AAC1B,SAASC,sBAAsB,QAAQ,qBAAqB;AAqB5D,OAAO,MAAMC,iCAAmBV,cAAqCW,WAAW;AAEhF,OAAO,SAASC;IACd,MAAMC,MAAMX,WAAWQ;IACvB,IAAIG,QAAQF,WAAW;QACrB,MAAM,IAAIG,MAAM;IAClB;IACA,OAAOD;AACT;AAEA;;CAEC,GACD,OAAO,SAASE;IACd,OAAOH;AACT;AAEA;;CAEC,GACD,OAAO,SAASI,mBAAmBC,KAAc;IAC/C,MAAM,EAAEC,iBAAiB,EAAE,GAAGH;IAC9B,IAAIE,UAAUN,WAAW,OAAO;IAChC,OAAOH,mBAAmBU,mBAAmBD;AAC/C;AAEA;;CAEC,GACD,OAAO,SAASE,kBAAkBC,KAA6B;IAC7D,MAAM,EAAEC,SAAS,EAAEC,eAAe,EAAEC,QAAQ,EAAEC,YAAY,EAAEC,kBAAkB,EAAE,GAAGL;IAEnF;;;;;GAKC,GAED,MAAM,CAACM,gBAAgBC,kBAAkB,GAAGtB,SAAyBgB;IACrE,MAAM,CAACO,sBAAsBC,wBAAwB,GAAGxB,SAAqCiB;IAE7F,MAAM,CAACQ,gBAAgBC,kBAAkB,GAAG1B,SAAS;IAErDF,UAAU;QACRwB,kBAAkBN;IACpB,GAAG;QAACA;QAAWS;KAAe;IAE9B3B,UAAU;QACR0B,wBAAwBP;IAC1B,GAAG;QAACA;KAAgB;IAEpB,MAAMU,UAAU/B,YAAY;QAC1B8B,kBAAkB,CAACE,UAAYA,UAAU;IAC3C,GAAG;QAACF;KAAkB;IAEtB,MAAMG,sBAAsBzB,uBAAuBmB;IACnDzB,UAAU;QACR,IAAI+B,sBAAsB,GAAG;YAC3B,MAAMC,WAAWC,YAAY;gBAC3BJ;YACF,GAAGE;YAEH,OAAO,IAAYG,cAAcF;QACnC;IACF,GAAG;QAACH;QAASE;KAAoB;IAEjC,MAAMrB,MAAMT,QAAQ;QAClB,MAAMc,oBAAoBZ,oBAAoBoB,kBAC1CnB,oBAAoBmB,kBACpBA;QACJ,OAAO;YACLL,WAAWK;YACXF,cAAcA,gBAAgBG;YAC9BT;YACAc;YACAM,YAAY,GAAGpB,kBAAkBqB,KAAK,CAAC,CAAC,EAAErB,kBAAkBsB,GAAG,CAAC,CAAC,EAAEZ,qBAAqB,CAAC,EAAEE,gBAAgB;YAC3GR,iBAAiBM;YACjBM,qBAAqBA;YACrBT,oBAAoBA,sBAAsBI;QAC5C;IACF,GAAG;QACDH;QACAF;QACAQ;QACAJ;QACAE;QACAI;QACAT;KACD;IAED,qBAAO,KAACf,iBAAiB+B,QAAQ;QAACC,OAAO7B;kBAAMU;;AACjD"}
+{"version":3,"sources":["../../../src/runtime/TimeRangeProvider/TimeRangeProvider.tsx"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport React, { createContext, ReactElement, useCallback, useContext, useEffect, useMemo, useState } from 'react';\nimport {\n  AbsoluteTimeRange,\n  DurationString,\n  TimeRangeValue,\n  isRelativeTimeRange,\n  toAbsoluteTimeRange,\n  getSuggestedStepMs,\n} from '@perses-dev/core';\nimport { useQueryClient } from '@tanstack/react-query';\nimport { getRefreshIntervalInMs } from './refresh-interval';\n\nexport interface TimeRangeProviderProps {\n  timeRange: TimeRangeValue;\n  refreshInterval?: DurationString;\n  setTimeRange: (value: TimeRangeValue) => void;\n  setRefreshInterval: (value: DurationString) => void;\n  children?: React.ReactNode;\n}\n\nexport interface TimeRange {\n  timeRange: TimeRangeValue;\n  absoluteTimeRange: AbsoluteTimeRange; // resolved absolute time for plugins to use\n  setTimeRange: (value: TimeRangeValue) => void;\n  refresh: () => void;\n  refreshInterval?: DurationString;\n  refreshIntervalInMs: number;\n  setRefreshInterval: (value: DurationString) => void;\n}\n\nexport const TimeRangeContext = createContext<TimeRange | undefined>(undefined);\n\nexport function useTimeRangeContext(): TimeRange {\n  const ctx = useContext(TimeRangeContext);\n  if (ctx === undefined) {\n    throw new Error('No TimeRangeContext found. Did you forget a Provider?');\n  }\n  return ctx;\n}\n\n/**\n * Get and set the current resolved time range at runtime.\n */\nexport function useTimeRange(): TimeRange {\n  return useTimeRangeContext();\n}\n\n/**\n * Gets the suggested step for a graph query in ms for the currently selected time range.\n */\nexport function useSuggestedStepMs(width?: number): number {\n  const { absoluteTimeRange } = useTimeRange();\n  if (width === undefined) return 0;\n  return getSuggestedStepMs(absoluteTimeRange, width);\n}\n\n/**\n * Provider implementation that supplies the time range state at runtime.\n */\nexport function TimeRangeProvider(props: TimeRangeProviderProps): ReactElement {\n  const { timeRange, refreshInterval, children, setTimeRange, setRefreshInterval } = props;\n\n  const queryClient = useQueryClient();\n  const [absoluteTimeRange, setAbsoluteTimeRange] = useState<AbsoluteTimeRange>(\n    isRelativeTimeRange(timeRange) ? toAbsoluteTimeRange(timeRange) : timeRange\n  );\n\n  const handleSetTimeRange = useCallback(\n    (value: TimeRangeValue) => {\n      setTimeRange(value);\n      setAbsoluteTimeRange(isRelativeTimeRange(value) ? toAbsoluteTimeRange(value) : value);\n    },\n    [setTimeRange]\n  );\n\n  // Refresh is called when clicking on the refresh button, it refreshes all queries including variables\n  const refresh = useCallback(() => {\n    setAbsoluteTimeRange(isRelativeTimeRange(timeRange) ? toAbsoluteTimeRange(timeRange) : timeRange);\n    queryClient\n      .invalidateQueries({ queryKey: ['query'] })\n      .finally(() => queryClient.removeQueries({ queryKey: ['query'], type: 'inactive' }));\n    queryClient\n      .invalidateQueries({ queryKey: ['variable'] })\n      .finally(() => queryClient.removeQueries({ queryKey: ['variable'], type: 'inactive' }));\n  }, [queryClient, timeRange]);\n\n  // Auto refresh is only refreshing queries of panels\n  const autoRefresh = useCallback(() => {\n    setAbsoluteTimeRange(isRelativeTimeRange(timeRange) ? toAbsoluteTimeRange(timeRange) : timeRange);\n    queryClient.invalidateQueries({ queryKey: ['query'] }).finally(() => {\n      queryClient.removeQueries({ queryKey: ['query'], type: 'inactive' });\n      queryClient.removeQueries({ queryKey: ['variable'], type: 'inactive' }); // Timerange is in queryKey, can lead to memory leak when using relative timerange\n    });\n  }, [queryClient, timeRange]);\n\n  const refreshIntervalInMs = useMemo(() => getRefreshIntervalInMs(refreshInterval), [refreshInterval]);\n  useEffect(() => {\n    if (refreshIntervalInMs > 0) {\n      const interval = setInterval(() => {\n        autoRefresh();\n      }, refreshIntervalInMs);\n\n      return (): void => clearInterval(interval);\n    }\n  }, [autoRefresh, refreshIntervalInMs]);\n\n  const ctx = useMemo(() => {\n    return {\n      timeRange: timeRange,\n      setTimeRange: handleSetTimeRange,\n      absoluteTimeRange: absoluteTimeRange,\n      refresh,\n      refreshInterval: refreshInterval,\n      refreshIntervalInMs: refreshIntervalInMs,\n      setRefreshInterval: setRefreshInterval,\n    };\n  }, [\n    absoluteTimeRange,\n    handleSetTimeRange,\n    refresh,\n    refreshInterval,\n    refreshIntervalInMs,\n    setRefreshInterval,\n    timeRange,\n  ]);\n\n  return <TimeRangeContext.Provider value={ctx}>{children}</TimeRangeContext.Provider>;\n}\n"],"names":["React","createContext","useCallback","useContext","useEffect","useMemo","useState","isRelativeTimeRange","toAbsoluteTimeRange","getSuggestedStepMs","useQueryClient","getRefreshIntervalInMs","TimeRangeContext","undefined","useTimeRangeContext","ctx","Error","useTimeRange","useSuggestedStepMs","width","absoluteTimeRange","TimeRangeProvider","props","timeRange","refreshInterval","children","setTimeRange","setRefreshInterval","queryClient","setAbsoluteTimeRange","handleSetTimeRange","value","refresh","invalidateQueries","queryKey","finally","removeQueries","type","autoRefresh","refreshIntervalInMs","interval","setInterval","clearInterval","Provider"],"mappings":"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"}

package/dist/runtime/TimeRangeProvider/TimeRangeProviders.d.ts

@@ -0,0 +1,10 @@
+import { DurationString, TimeRangeValue } from '@perses-dev/core';
+import React, { ReactElement } from 'react';
+export interface TimeRangeProvidersProps {
+    initialTimeRange: TimeRangeValue;
+    initialRefreshInterval?: DurationString;
+    children?: React.ReactNode;
+}
+export declare function TimeRangeProviderWithQueryParams({ initialTimeRange, initialRefreshInterval, children, }: TimeRangeProvidersProps): ReactElement;
+export declare function TimeRangeProviderBasic({ initialTimeRange, initialRefreshInterval, children, }: TimeRangeProvidersProps): ReactElement;
+//# sourceMappingURL=TimeRangeProviders.d.ts.map

package/dist/runtime/TimeRangeProvider/TimeRangeProviders.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TimeRangeProviders.d.ts","sourceRoot":"","sources":["../../../src/runtime/TimeRangeProvider/TimeRangeProviders.tsx"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,KAAK,EAAE,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAI5C,MAAM,WAAW,uBAAuB;IACtC,gBAAgB,EAAE,cAAc,CAAC;IACjC,sBAAsB,CAAC,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAED,wBAAgB,gCAAgC,CAAC,EAC/C,gBAAgB,EAChB,sBAAsB,EACtB,QAAQ,GACT,EAAE,uBAAuB,GAAG,YAAY,CAcxC;AAED,wBAAgB,sBAAsB,CAAC,EACrC,gBAAgB,EAChB,sBAAsB,EACtB,QAAQ,GACT,EAAE,uBAAuB,GAAG,YAAY,CAcxC"}

package/dist/runtime/TimeRangeProvider/{TimeRangeProviderWithQueryParams.js → TimeRangeProviders.js}

@@ -14,8 +14,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import { TimeRangeProvider } from './TimeRangeProvider';
 import { useSetRefreshIntervalParams, useTimeRangeParams } from './query-params';
-export function TimeRangeProviderWithQueryParams(props) {
-    const { initialTimeRange, initialRefreshInterval, children } = props;
+export function TimeRangeProviderWithQueryParams({ initialTimeRange, initialRefreshInterval, children }) {
     const { timeRange, setTimeRange } = useTimeRangeParams(initialTimeRange);
     const { refreshInterval, setRefreshInterval } = useSetRefreshIntervalParams(initialRefreshInterval);
     return /*#__PURE__*/ _jsx(TimeRangeProvider, {
@@ -26,5 +25,16 @@ export function TimeRangeProviderWithQueryParams(props) {
         children: children
     });
 }
+export function TimeRangeProviderBasic({ initialTimeRange, initialRefreshInterval, children }) {
+    const [timeRange, setTimeRange] = React.useState(initialTimeRange);
+    const [refreshInterval, setRefreshInterval] = React.useState(initialRefreshInterval);
+    return /*#__PURE__*/ _jsx(TimeRangeProvider, {
+        timeRange: timeRange,
+        refreshInterval: refreshInterval,
+        setTimeRange: setTimeRange,
+        setRefreshInterval: setRefreshInterval,
+        children: children
+    });
+}
 
-//# sourceMappingURL=TimeRangeProviderWithQueryParams.js.map
+//# sourceMappingURL=TimeRangeProviders.js.map

package/dist/runtime/TimeRangeProvider/TimeRangeProviders.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/runtime/TimeRangeProvider/TimeRangeProviders.tsx"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { DurationString, TimeRangeValue } from '@perses-dev/core';\nimport React, { ReactElement } from 'react';\nimport { TimeRangeProvider } from './TimeRangeProvider';\nimport { useSetRefreshIntervalParams, useTimeRangeParams } from './query-params';\n\nexport interface TimeRangeProvidersProps {\n  initialTimeRange: TimeRangeValue;\n  initialRefreshInterval?: DurationString;\n  children?: React.ReactNode;\n}\n\nexport function TimeRangeProviderWithQueryParams({\n  initialTimeRange,\n  initialRefreshInterval,\n  children,\n}: TimeRangeProvidersProps): ReactElement {\n  const { timeRange, setTimeRange } = useTimeRangeParams(initialTimeRange);\n  const { refreshInterval, setRefreshInterval } = useSetRefreshIntervalParams(initialRefreshInterval);\n\n  return (\n    <TimeRangeProvider\n      timeRange={timeRange}\n      refreshInterval={refreshInterval}\n      setTimeRange={setTimeRange}\n      setRefreshInterval={setRefreshInterval}\n    >\n      {children}\n    </TimeRangeProvider>\n  );\n}\n\nexport function TimeRangeProviderBasic({\n  initialTimeRange,\n  initialRefreshInterval,\n  children,\n}: TimeRangeProvidersProps): ReactElement {\n  const [timeRange, setTimeRange] = React.useState<TimeRangeValue>(initialTimeRange);\n  const [refreshInterval, setRefreshInterval] = React.useState<DurationString | undefined>(initialRefreshInterval);\n\n  return (\n    <TimeRangeProvider\n      timeRange={timeRange}\n      refreshInterval={refreshInterval}\n      setTimeRange={setTimeRange}\n      setRefreshInterval={setRefreshInterval}\n    >\n      {children}\n    </TimeRangeProvider>\n  );\n}\n"],"names":["React","TimeRangeProvider","useSetRefreshIntervalParams","useTimeRangeParams","TimeRangeProviderWithQueryParams","initialTimeRange","initialRefreshInterval","children","timeRange","setTimeRange","refreshInterval","setRefreshInterval","TimeRangeProviderBasic","useState"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;AAGjC,OAAOA,WAA6B,QAAQ;AAC5C,SAASC,iBAAiB,QAAQ,sBAAsB;AACxD,SAASC,2BAA2B,EAAEC,kBAAkB,QAAQ,iBAAiB;AAQjF,OAAO,SAASC,iCAAiC,EAC/CC,gBAAgB,EAChBC,sBAAsB,EACtBC,QAAQ,EACgB;IACxB,MAAM,EAAEC,SAAS,EAAEC,YAAY,EAAE,GAAGN,mBAAmBE;IACvD,MAAM,EAAEK,eAAe,EAAEC,kBAAkB,EAAE,GAAGT,4BAA4BI;IAE5E,qBACE,KAACL;QACCO,WAAWA;QACXE,iBAAiBA;QACjBD,cAAcA;QACdE,oBAAoBA;kBAEnBJ;;AAGP;AAEA,OAAO,SAASK,uBAAuB,EACrCP,gBAAgB,EAChBC,sBAAsB,EACtBC,QAAQ,EACgB;IACxB,MAAM,CAACC,WAAWC,aAAa,GAAGT,MAAMa,QAAQ,CAAiBR;IACjE,MAAM,CAACK,iBAAiBC,mBAAmB,GAAGX,MAAMa,QAAQ,CAA6BP;IAEzF,qBACE,KAACL;QACCO,WAAWA;QACXE,iBAAiBA;QACjBD,cAAcA;QACdE,oBAAoBA;kBAEnBJ;;AAGP"}

package/dist/runtime/TimeRangeProvider/index.d.ts

@@ -1,5 +1,5 @@
 export * from './TimeRangeProvider';
-export * from './TimeRangeProviderWithQueryParams';
+export * from './TimeRangeProviders';
 export * from './TimeRangeSettingsProvider';
 export * from './query-params';
 //# sourceMappingURL=index.d.ts.map

package/dist/runtime/TimeRangeProvider/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/runtime/TimeRangeProvider/index.ts"],"names":[],"mappings":"AAaA,cAAc,qBAAqB,CAAC;AACpC,cAAc,oCAAoC,CAAC;AACnD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/runtime/TimeRangeProvider/index.ts"],"names":[],"mappings":"AAaA,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gBAAgB,CAAC"}

package/dist/runtime/TimeRangeProvider/index.js

@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 export * from './TimeRangeProvider';
-export * from './TimeRangeProviderWithQueryParams';
+export * from './TimeRangeProviders';
 export * from './TimeRangeSettingsProvider';
 export * from './query-params';
 

package/dist/runtime/TimeRangeProvider/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/runtime/TimeRangeProvider/index.ts"],"sourcesContent":["// Copyright 2024 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nexport * from './TimeRangeProvider';\nexport * from './TimeRangeProviderWithQueryParams';\nexport * from './TimeRangeSettingsProvider';\nexport * from './query-params';\n"],"names":[],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,cAAc,sBAAsB;AACpC,cAAc,qCAAqC;AACnD,cAAc,8BAA8B;AAC5C,cAAc,iBAAiB"}
+{"version":3,"sources":["../../../src/runtime/TimeRangeProvider/index.ts"],"sourcesContent":["// Copyright 2024 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nexport * from './TimeRangeProvider';\nexport * from './TimeRangeProviders';\nexport * from './TimeRangeSettingsProvider';\nexport * from './query-params';\n"],"names":[],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,cAAc,sBAAsB;AACpC,cAAc,uBAAuB;AACrC,cAAc,8BAA8B;AAC5C,cAAc,iBAAiB"}

package/dist/runtime/log-queries.js

@@ -30,8 +30,9 @@ export function useLogQueries(definitions) {
     return useQueries({
         queries: definitions.map((definition)=>{
             const queryKey = [
+                'query',
+                LOG_QUERY_KEY,
                 definition,
-                datasourceStore,
                 absoluteTimeRange,
                 variableValues
             ];

package/dist/runtime/log-queries.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/runtime/log-queries.ts"],"sourcesContent":["// Copyright 2025 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { QueryDefinition, UnknownSpec } from '@perses-dev/core';\nimport { useQueries, UseQueryResult } from '@tanstack/react-query';\nimport { LogQueryResult } from '../model/log-queries';\nimport { useDatasourceStore } from './datasources';\nimport { usePluginRegistry } from './plugin-registry';\nimport { useTimeRange } from './TimeRangeProvider';\nimport { useVariableValues } from './variables';\n\nexport type LogQueryDefinition<PluginSpec = UnknownSpec> = QueryDefinition<'LogQuery', PluginSpec>;\nexport const LOG_QUERY_KEY = 'LogQuery';\n\nexport function useLogQueries(definitions: LogQueryDefinition[]): Array<UseQueryResult<LogQueryResult>> {\n  const { getPlugin } = usePluginRegistry();\n  const datasourceStore = useDatasourceStore();\n  const { absoluteTimeRange } = useTimeRange();\n  const variableValues = useVariableValues();\n\n  const context = {\n    timeRange: absoluteTimeRange,\n    variableState: variableValues,\n    datasourceStore,\n    refreshKey: '',\n  };\n\n  return useQueries({\n    queries: definitions.map((definition) => {\n      const queryKey = [definition, datasourceStore, absoluteTimeRange, variableValues] as const;\n      const logQueryKind = definition?.spec?.plugin?.kind;\n      return {\n        queryKey: queryKey,\n        queryFn: async (): Promise<LogQueryResult> => {\n          const plugin = await getPlugin(LOG_QUERY_KEY, logQueryKind);\n          const data = await plugin.getLogData(definition.spec.plugin.spec, context);\n          return data;\n        },\n\n        structuralSharing: false,\n      };\n    }),\n  });\n}\n"],"names":["useQueries","useDatasourceStore","usePluginRegistry","useTimeRange","useVariableValues","LOG_QUERY_KEY","useLogQueries","definitions","getPlugin","datasourceStore","absoluteTimeRange","variableValues","context","timeRange","variableState","refreshKey","queries","map","definition","queryKey","logQueryKind","spec","plugin","kind","queryFn","data","getLogData","structuralSharing"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAGjC,SAASA,UAAU,QAAwB,wBAAwB;AAEnE,SAASC,kBAAkB,QAAQ,gBAAgB;AACnD,SAASC,iBAAiB,QAAQ,oBAAoB;AACtD,SAASC,YAAY,QAAQ,sBAAsB;AACnD,SAASC,iBAAiB,QAAQ,cAAc;AAGhD,OAAO,MAAMC,gBAAgB,WAAW;AAExC,OAAO,SAASC,cAAcC,WAAiC;IAC7D,MAAM,EAAEC,SAAS,EAAE,GAAGN;IACtB,MAAMO,kBAAkBR;IACxB,MAAM,EAAES,iBAAiB,EAAE,GAAGP;IAC9B,MAAMQ,iBAAiBP;IAEvB,MAAMQ,UAAU;QACdC,WAAWH;QACXI,eAAeH;QACfF;QACAM,YAAY;IACd;IAEA,OAAOf,WAAW;QAChBgB,SAAST,YAAYU,GAAG,CAAC,CAACC;YACxB,MAAMC,WAAW;gBAACD;gBAAYT;gBAAiBC;gBAAmBC;aAAe;YACjF,MAAMS,eAAeF,YAAYG,MAAMC,QAAQC;YAC/C,OAAO;gBACLJ,UAAUA;gBACVK,SAAS;oBACP,MAAMF,SAAS,MAAMd,UAAUH,eAAee;oBAC9C,MAAMK,OAAO,MAAMH,OAAOI,UAAU,CAACR,WAAWG,IAAI,CAACC,MAAM,CAACD,IAAI,EAAET;oBAClE,OAAOa;gBACT;gBAEAE,mBAAmB;YACrB;QACF;IACF;AACF"}
+{"version":3,"sources":["../../src/runtime/log-queries.ts"],"sourcesContent":["// Copyright 2025 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { QueryDefinition, UnknownSpec } from '@perses-dev/core';\nimport { useQueries, UseQueryResult } from '@tanstack/react-query';\nimport { LogQueryResult } from '../model/log-queries';\nimport { useDatasourceStore } from './datasources';\nimport { usePluginRegistry } from './plugin-registry';\nimport { useTimeRange } from './TimeRangeProvider';\nimport { useVariableValues } from './variables';\n\nexport type LogQueryDefinition<PluginSpec = UnknownSpec> = QueryDefinition<'LogQuery', PluginSpec>;\nexport const LOG_QUERY_KEY = 'LogQuery';\n\nexport function useLogQueries(definitions: LogQueryDefinition[]): Array<UseQueryResult<LogQueryResult>> {\n  const { getPlugin } = usePluginRegistry();\n  const datasourceStore = useDatasourceStore();\n  const { absoluteTimeRange } = useTimeRange();\n  const variableValues = useVariableValues();\n\n  const context = {\n    timeRange: absoluteTimeRange,\n    variableState: variableValues,\n    datasourceStore,\n    refreshKey: '',\n  };\n\n  return useQueries({\n    queries: definitions.map((definition) => {\n      const queryKey = ['query', LOG_QUERY_KEY, definition, absoluteTimeRange, variableValues] as const;\n      const logQueryKind = definition?.spec?.plugin?.kind;\n      return {\n        queryKey: queryKey,\n        queryFn: async (): Promise<LogQueryResult> => {\n          const plugin = await getPlugin(LOG_QUERY_KEY, logQueryKind);\n          const data = await plugin.getLogData(definition.spec.plugin.spec, context);\n          return data;\n        },\n\n        structuralSharing: false,\n      };\n    }),\n  });\n}\n"],"names":["useQueries","useDatasourceStore","usePluginRegistry","useTimeRange","useVariableValues","LOG_QUERY_KEY","useLogQueries","definitions","getPlugin","datasourceStore","absoluteTimeRange","variableValues","context","timeRange","variableState","refreshKey","queries","map","definition","queryKey","logQueryKind","spec","plugin","kind","queryFn","data","getLogData","structuralSharing"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAGjC,SAASA,UAAU,QAAwB,wBAAwB;AAEnE,SAASC,kBAAkB,QAAQ,gBAAgB;AACnD,SAASC,iBAAiB,QAAQ,oBAAoB;AACtD,SAASC,YAAY,QAAQ,sBAAsB;AACnD,SAASC,iBAAiB,QAAQ,cAAc;AAGhD,OAAO,MAAMC,gBAAgB,WAAW;AAExC,OAAO,SAASC,cAAcC,WAAiC;IAC7D,MAAM,EAAEC,SAAS,EAAE,GAAGN;IACtB,MAAMO,kBAAkBR;IACxB,MAAM,EAAES,iBAAiB,EAAE,GAAGP;IAC9B,MAAMQ,iBAAiBP;IAEvB,MAAMQ,UAAU;QACdC,WAAWH;QACXI,eAAeH;QACfF;QACAM,YAAY;IACd;IAEA,OAAOf,WAAW;QAChBgB,SAAST,YAAYU,GAAG,CAAC,CAACC;YACxB,MAAMC,WAAW;gBAAC;gBAASd;gBAAea;gBAAYR;gBAAmBC;aAAe;YACxF,MAAMS,eAAeF,YAAYG,MAAMC,QAAQC;YAC/C,OAAO;gBACLJ,UAAUA;gBACVK,SAAS;oBACP,MAAMF,SAAS,MAAMd,UAAUH,eAAee;oBAC9C,MAAMK,OAAO,MAAMH,OAAOI,UAAU,CAACR,WAAWG,IAAI,CAACC,MAAM,CAACD,IAAI,EAAET;oBAClE,OAAOa;gBACT;gBAEAE,mBAAmB;YACrB;QACF;IACF;AACF"}

package/dist/runtime/time-series-queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"time-series-queries.d.ts","sourceRoot":"","sources":["../../src/runtime/time-series-queries.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,yBAAyB,EAAe,MAAM,kBAAkB,CAAC;AAC1F,OAAO,EAEL,UAAU,EAEV,oBAAoB,EAIpB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,mBAAmB,EAA0B,mBAAmB,EAAyB,MAAM,UAAU,CAAC;AAOnH,MAAM,WAAW,yBAAyB;IACxC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,mBAAmB,CAAC;CAC5B;AAED,eAAO,MAAM,qBAAqB,oBAAoB,CAAC;AA8CvD;;GAEG;AACH,eAAO,MAAM,kBAAkB,eACjB,yBAAyB,YAC3B,yBAAyB,iBACpB,qBAAqB,cAAc,CAAC,KAClD,eAAe,cAAc,CAiB/B,CAAC;AAEF;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,yBAAyB,EAAE,EACxC,OAAO,CAAC,EAAE,yBAAyB,EACnC,YAAY,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,UAAU,CAAC,GACpD,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAkCvC;AAkBD;;GAEG;AACH,wBAAgB,0BAA0B,IAAI,mBAAmB,EAAE,CAIlE;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,UAAU,GAAG,mBAAmB,EAAE,CAWnF"}
+{"version":3,"file":"time-series-queries.d.ts","sourceRoot":"","sources":["../../src/runtime/time-series-queries.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,yBAAyB,EAAe,MAAM,kBAAkB,CAAC;AAC1F,OAAO,EAEL,UAAU,EAEV,oBAAoB,EAIpB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,mBAAmB,EAA0B,mBAAmB,EAAyB,MAAM,UAAU,CAAC;AAOnH,MAAM,WAAW,yBAAyB;IACxC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,mBAAmB,CAAC;CAC5B;AAED,eAAO,MAAM,qBAAqB,oBAAoB,CAAC;AA+CvD;;GAEG;AACH,eAAO,MAAM,kBAAkB,eACjB,yBAAyB,YAC3B,yBAAyB,iBACpB,qBAAqB,cAAc,CAAC,KAClD,eAAe,cAAc,CAiB/B,CAAC;AAEF;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,yBAAyB,EAAE,EACxC,OAAO,CAAC,EAAE,yBAAyB,EACnC,YAAY,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,UAAU,CAAC,GACpD,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CA6BvC;AAiBD;;GAEG;AACH,wBAAgB,0BAA0B,IAAI,mBAAmB,EAAE,CAIlE;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,UAAU,GAAG,mBAAmB,EAAE,CAWnF"}

package/dist/runtime/time-series-queries.js

@@ -18,20 +18,20 @@ import { filterVariableStateMap, getVariableValuesKey } from './utils';
 import { useAllVariableValues } from './variables';
 export const TIME_SERIES_QUERY_KEY = 'TimeSeriesQuery';
 function getQueryOptions({ plugin, definition, context }) {
-    const { timeRange, datasourceStore, suggestedStepMs, mode, variableState, refreshKey } = context;
+    const { timeRange, suggestedStepMs, mode, variableState } = context;
     const dependencies = plugin?.dependsOn ? plugin.dependsOn(definition.spec.plugin.spec, context) : {};
     const variableDependencies = dependencies?.variables;
     // Determine queryKey
     const filteredVariabledState = filterVariableStateMap(variableState, variableDependencies);
     const variablesValueKey = getVariableValuesKey(filteredVariabledState);
     const queryKey = [
+        'query',
+        TIME_SERIES_QUERY_KEY,
         definition,
         timeRange,
-        datasourceStore,
-        suggestedStepMs,
-        mode,
         variablesValueKey,
-        refreshKey
+        suggestedStepMs,
+        mode
     ];
     // Determine queryEnabled
     let waitToLoad = false;
@@ -77,8 +77,8 @@ function getQueryOptions({ plugin, definition, context }) {
     const { getPlugin } = usePluginRegistry();
     const context = {
         ...useTimeSeriesQueryContext(),
-        // We need mode to be part query key because this drives the type of query done (instant VS range query)
-        mode: options?.mode
+        mode: options?.mode,
+        suggestedStepMs: options?.suggestedStepMs
     };
     const pluginLoaderResponse = usePlugins(TIME_SERIES_QUERY_KEY, definitions.map((d)=>({
             kind: d.spec.plugin.kind
@@ -96,13 +96,8 @@ function getQueryOptions({ plugin, definition, context }) {
                 enabled: (queryOptions?.enabled ?? true) && queryEnabled,
                 queryKey: queryKey,
                 queryFn: async ({ signal })=>{
-                    const ctx = {
-                        ...context,
-                        // Keep suggested step changes out of the query key, so we don´t have to run again query when it changes
-                        suggestedStepMs: options?.suggestedStepMs
-                    };
                     const plugin = await getPlugin(TIME_SERIES_QUERY_KEY, definition.spec.plugin.kind);
-                    const data = await plugin.getTimeSeriesData(definition.spec.plugin.spec, ctx, signal);
+                    const data = await plugin.getTimeSeriesData(definition.spec.plugin.spec, context, signal);
                     return data;
                 }
             };
@@ -112,14 +107,13 @@ function getQueryOptions({ plugin, definition, context }) {
 /**
  * Build the time series query context object from data available at runtime
  */ function useTimeSeriesQueryContext() {
-    const { absoluteTimeRange, refreshKey } = useTimeRange();
+    const { absoluteTimeRange } = useTimeRange();
     const variableState = useAllVariableValues();
     const datasourceStore = useDatasourceStore();
     return {
         timeRange: absoluteTimeRange,
         variableState,
-        datasourceStore,
-        refreshKey
+        datasourceStore
     };
 }
 /**

package/dist/runtime/time-series-queries.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/runtime/time-series-queries.ts"],"sourcesContent":["// Copyright 2024 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { TimeSeriesData, TimeSeriesQueryDefinition, UnknownSpec } from '@perses-dev/core';\nimport {\n  Query,\n  QueryCache,\n  QueryKey,\n  QueryObserverOptions,\n  useQueries,\n  useQuery,\n  useQueryClient,\n  UseQueryResult,\n} from '@tanstack/react-query';\nimport { TimeSeriesDataQuery, TimeSeriesQueryContext, TimeSeriesQueryMode, TimeSeriesQueryPlugin } from '../model';\nimport { useTimeRange } from './TimeRangeProvider';\nimport { useDatasourceStore } from './datasources';\nimport { usePlugin, usePluginRegistry, usePlugins } from './plugin-registry';\nimport { filterVariableStateMap, getVariableValuesKey } from './utils';\nimport { useAllVariableValues } from './variables';\n\nexport interface UseTimeSeriesQueryOptions {\n  suggestedStepMs?: number;\n  mode?: TimeSeriesQueryMode;\n}\n\nexport const TIME_SERIES_QUERY_KEY = 'TimeSeriesQuery';\n\nfunction getQueryOptions({\n  plugin,\n  definition,\n  context,\n}: {\n  plugin?: TimeSeriesQueryPlugin;\n  definition: TimeSeriesQueryDefinition;\n  context: TimeSeriesQueryContext;\n}): {\n  queryKey: QueryKey;\n  queryEnabled: boolean;\n} {\n  const { timeRange, datasourceStore, suggestedStepMs, mode, variableState, refreshKey } = context;\n\n  const dependencies = plugin?.dependsOn ? plugin.dependsOn(definition.spec.plugin.spec, context) : {};\n  const variableDependencies = dependencies?.variables;\n\n  // Determine queryKey\n  const filteredVariabledState = filterVariableStateMap(variableState, variableDependencies);\n  const variablesValueKey = getVariableValuesKey(filteredVariabledState);\n  const queryKey = [\n    definition,\n    timeRange,\n    datasourceStore,\n    suggestedStepMs,\n    mode,\n    variablesValueKey,\n    refreshKey,\n  ] as const;\n\n  // Determine queryEnabled\n  let waitToLoad = false;\n  if (variableDependencies) {\n    waitToLoad = variableDependencies.some((v) => variableState[v]?.loading);\n  }\n\n  const queryEnabled = plugin !== undefined && !waitToLoad;\n\n  return {\n    queryKey,\n    queryEnabled,\n  };\n}\n\n/**\n * Runs a time series query using a plugin and returns the results.\n */\nexport const useTimeSeriesQuery = (\n  definition: TimeSeriesQueryDefinition,\n  options?: UseTimeSeriesQueryOptions,\n  queryOptions?: QueryObserverOptions<TimeSeriesData>\n): UseQueryResult<TimeSeriesData> => {\n  const { data: plugin } = usePlugin(TIME_SERIES_QUERY_KEY, definition.spec.plugin.kind);\n  const context = useTimeSeriesQueryContext();\n  const { queryEnabled, queryKey } = getQueryOptions({ plugin, definition, context });\n  return useQuery({\n    enabled: (queryOptions?.enabled ?? true) || queryEnabled,\n    queryKey: queryKey,\n    queryFn: ({ signal }) => {\n      // The 'enabled' option should prevent this from happening, but make TypeScript happy by checking\n      if (plugin === undefined) {\n        throw new Error('Expected plugin to be loaded');\n      }\n      // Keep options out of query key so we don't re-run queries because suggested step changes\n      const ctx: TimeSeriesQueryContext = { ...context, suggestedStepMs: options?.suggestedStepMs };\n      return plugin.getTimeSeriesData(definition.spec.plugin.spec, ctx, signal);\n    },\n  });\n};\n\n/**\n * Runs multiple time series queries using plugins and returns the results.\n */\nexport function useTimeSeriesQueries(\n  definitions: TimeSeriesQueryDefinition[],\n  options?: UseTimeSeriesQueryOptions,\n  queryOptions?: Omit<QueryObserverOptions, 'queryKey'>\n): Array<UseQueryResult<TimeSeriesData>> {\n  const { getPlugin } = usePluginRegistry();\n  const context = {\n    ...useTimeSeriesQueryContext(),\n    // We need mode to be part query key because this drives the type of query done (instant VS range query)\n    mode: options?.mode,\n  };\n\n  const pluginLoaderResponse = usePlugins(\n    TIME_SERIES_QUERY_KEY,\n    definitions.map((d) => ({ kind: d.spec.plugin.kind }))\n  );\n\n  return useQueries({\n    queries: definitions.map((definition, idx) => {\n      const plugin = pluginLoaderResponse[idx]?.data;\n      const { queryEnabled, queryKey } = getQueryOptions({ plugin, definition, context });\n      return {\n        ...(queryOptions as QueryObserverOptions<unknown>),\n        enabled: (queryOptions?.enabled ?? true) && queryEnabled,\n        queryKey: queryKey,\n        queryFn: async ({ signal }: { signal: AbortSignal }): Promise<TimeSeriesData> => {\n          const ctx: TimeSeriesQueryContext = {\n            ...context,\n            // Keep suggested step changes out of the query key, so we don´t have to run again query when it changes\n            suggestedStepMs: options?.suggestedStepMs,\n          };\n          const plugin = await getPlugin(TIME_SERIES_QUERY_KEY, definition.spec.plugin.kind);\n          const data = await plugin.getTimeSeriesData(definition.spec.plugin.spec, ctx, signal);\n          return data;\n        },\n      } as QueryObserverOptions<unknown>;\n    }),\n  }) as Array<UseQueryResult<TimeSeriesData>>;\n}\n\n/**\n * Build the time series query context object from data available at runtime\n */\nfunction useTimeSeriesQueryContext(): TimeSeriesQueryContext {\n  const { absoluteTimeRange, refreshKey } = useTimeRange();\n  const variableState = useAllVariableValues();\n  const datasourceStore = useDatasourceStore();\n\n  return {\n    timeRange: absoluteTimeRange,\n    variableState,\n    datasourceStore,\n    refreshKey,\n  };\n}\n\n/**\n * Get active time series queries for query results summary\n */\nexport function useActiveTimeSeriesQueries(): TimeSeriesDataQuery[] {\n  const queryClient = useQueryClient();\n  const queryCache = queryClient.getQueryCache();\n  return getActiveTimeSeriesQueries(queryCache);\n}\n\n/**\n * Filter all cached queries down to only active time series queries\n */\nexport function getActiveTimeSeriesQueries(cache: QueryCache): TimeSeriesDataQuery[] {\n  const queries: TimeSeriesDataQuery[] = [];\n\n  for (const query of cache.findAll({ type: 'active' })) {\n    const firstPart = query.queryKey?.[0] as UnknownSpec;\n    if (firstPart?.kind && (firstPart.kind as string).startsWith(TIME_SERIES_QUERY_KEY)) {\n      queries.push(query as Query<TimeSeriesData, unknown, TimeSeriesData, QueryKey>);\n    }\n  }\n\n  return queries;\n}\n"],"names":["useQueries","useQuery","useQueryClient","useTimeRange","useDatasourceStore","usePlugin","usePluginRegistry","usePlugins","filterVariableStateMap","getVariableValuesKey","useAllVariableValues","TIME_SERIES_QUERY_KEY","getQueryOptions","plugin","definition","context","timeRange","datasourceStore","suggestedStepMs","mode","variableState","refreshKey","dependencies","dependsOn","spec","variableDependencies","variables","filteredVariabledState","variablesValueKey","queryKey","waitToLoad","some","v","loading","queryEnabled","undefined","useTimeSeriesQuery","options","queryOptions","data","kind","useTimeSeriesQueryContext","enabled","queryFn","signal","Error","ctx","getTimeSeriesData","useTimeSeriesQueries","definitions","getPlugin","pluginLoaderResponse","map","d","queries","idx","absoluteTimeRange","useActiveTimeSeriesQueries","queryClient","queryCache","getQueryCache","getActiveTimeSeriesQueries","cache","query","findAll","type","firstPart","startsWith","push"],"mappings":"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"}
+{"version":3,"sources":["../../src/runtime/time-series-queries.ts"],"sourcesContent":["// Copyright 2024 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { TimeSeriesData, TimeSeriesQueryDefinition, UnknownSpec } from '@perses-dev/core';\nimport {\n  Query,\n  QueryCache,\n  QueryKey,\n  QueryObserverOptions,\n  useQueries,\n  useQuery,\n  useQueryClient,\n  UseQueryResult,\n} from '@tanstack/react-query';\nimport { TimeSeriesDataQuery, TimeSeriesQueryContext, TimeSeriesQueryMode, TimeSeriesQueryPlugin } from '../model';\nimport { useTimeRange } from './TimeRangeProvider';\nimport { useDatasourceStore } from './datasources';\nimport { usePlugin, usePluginRegistry, usePlugins } from './plugin-registry';\nimport { filterVariableStateMap, getVariableValuesKey } from './utils';\nimport { useAllVariableValues } from './variables';\n\nexport interface UseTimeSeriesQueryOptions {\n  suggestedStepMs?: number;\n  mode?: TimeSeriesQueryMode;\n}\n\nexport const TIME_SERIES_QUERY_KEY = 'TimeSeriesQuery';\n\nfunction getQueryOptions({\n  plugin,\n  definition,\n  context,\n}: {\n  plugin?: TimeSeriesQueryPlugin;\n  definition: TimeSeriesQueryDefinition;\n  context: TimeSeriesQueryContext;\n}): {\n  queryKey: QueryKey;\n  queryEnabled: boolean;\n} {\n  const { timeRange, suggestedStepMs, mode, variableState } = context;\n\n  const dependencies = plugin?.dependsOn ? plugin.dependsOn(definition.spec.plugin.spec, context) : {};\n  const variableDependencies = dependencies?.variables;\n\n  // Determine queryKey\n  const filteredVariabledState = filterVariableStateMap(variableState, variableDependencies);\n  const variablesValueKey = getVariableValuesKey(filteredVariabledState);\n\n  const queryKey = [\n    'query',\n    TIME_SERIES_QUERY_KEY,\n    definition,\n    timeRange,\n    variablesValueKey,\n    suggestedStepMs,\n    mode,\n  ] as const;\n\n  // Determine queryEnabled\n  let waitToLoad = false;\n  if (variableDependencies) {\n    waitToLoad = variableDependencies.some((v) => variableState[v]?.loading);\n  }\n\n  const queryEnabled = plugin !== undefined && !waitToLoad;\n\n  return {\n    queryKey,\n    queryEnabled,\n  };\n}\n\n/**\n * Runs a time series query using a plugin and returns the results.\n */\nexport const useTimeSeriesQuery = (\n  definition: TimeSeriesQueryDefinition,\n  options?: UseTimeSeriesQueryOptions,\n  queryOptions?: QueryObserverOptions<TimeSeriesData>\n): UseQueryResult<TimeSeriesData> => {\n  const { data: plugin } = usePlugin(TIME_SERIES_QUERY_KEY, definition.spec.plugin.kind);\n  const context = useTimeSeriesQueryContext();\n  const { queryEnabled, queryKey } = getQueryOptions({ plugin, definition, context });\n  return useQuery({\n    enabled: (queryOptions?.enabled ?? true) || queryEnabled,\n    queryKey: queryKey,\n    queryFn: ({ signal }) => {\n      // The 'enabled' option should prevent this from happening, but make TypeScript happy by checking\n      if (plugin === undefined) {\n        throw new Error('Expected plugin to be loaded');\n      }\n      // Keep options out of query key so we don't re-run queries because suggested step changes\n      const ctx: TimeSeriesQueryContext = { ...context, suggestedStepMs: options?.suggestedStepMs };\n      return plugin.getTimeSeriesData(definition.spec.plugin.spec, ctx, signal);\n    },\n  });\n};\n\n/**\n * Runs multiple time series queries using plugins and returns the results.\n */\nexport function useTimeSeriesQueries(\n  definitions: TimeSeriesQueryDefinition[],\n  options?: UseTimeSeriesQueryOptions,\n  queryOptions?: Omit<QueryObserverOptions, 'queryKey'>\n): Array<UseQueryResult<TimeSeriesData>> {\n  const { getPlugin } = usePluginRegistry();\n  const context = {\n    ...useTimeSeriesQueryContext(),\n    mode: options?.mode,\n    suggestedStepMs: options?.suggestedStepMs,\n  };\n\n  const pluginLoaderResponse = usePlugins(\n    TIME_SERIES_QUERY_KEY,\n    definitions.map((d) => ({ kind: d.spec.plugin.kind }))\n  );\n\n  return useQueries({\n    queries: definitions.map((definition, idx) => {\n      const plugin = pluginLoaderResponse[idx]?.data;\n      const { queryEnabled, queryKey } = getQueryOptions({ plugin, definition, context });\n      return {\n        ...queryOptions,\n        enabled: (queryOptions?.enabled ?? true) && queryEnabled,\n        queryKey: queryKey,\n        queryFn: async ({ signal }: { signal: AbortSignal }): Promise<TimeSeriesData> => {\n          const plugin = await getPlugin(TIME_SERIES_QUERY_KEY, definition.spec.plugin.kind);\n          const data = await plugin.getTimeSeriesData(definition.spec.plugin.spec, context, signal);\n          return data;\n        },\n      } as QueryObserverOptions;\n    }),\n  }) as Array<UseQueryResult<TimeSeriesData>>;\n}\n\n/**\n * Build the time series query context object from data available at runtime\n */\nfunction useTimeSeriesQueryContext(): TimeSeriesQueryContext {\n  const { absoluteTimeRange } = useTimeRange();\n  const variableState = useAllVariableValues();\n  const datasourceStore = useDatasourceStore();\n\n  return {\n    timeRange: absoluteTimeRange,\n    variableState,\n    datasourceStore,\n  };\n}\n\n/**\n * Get active time series queries for query results summary\n */\nexport function useActiveTimeSeriesQueries(): TimeSeriesDataQuery[] {\n  const queryClient = useQueryClient();\n  const queryCache = queryClient.getQueryCache();\n  return getActiveTimeSeriesQueries(queryCache);\n}\n\n/**\n * Filter all cached queries down to only active time series queries\n */\nexport function getActiveTimeSeriesQueries(cache: QueryCache): TimeSeriesDataQuery[] {\n  const queries: TimeSeriesDataQuery[] = [];\n\n  for (const query of cache.findAll({ type: 'active' })) {\n    const firstPart = query.queryKey?.[0] as UnknownSpec;\n    if (firstPart?.kind && (firstPart.kind as string).startsWith(TIME_SERIES_QUERY_KEY)) {\n      queries.push(query as Query<TimeSeriesData, unknown, TimeSeriesData, QueryKey>);\n    }\n  }\n\n  return queries;\n}\n"],"names":["useQueries","useQuery","useQueryClient","useTimeRange","useDatasourceStore","usePlugin","usePluginRegistry","usePlugins","filterVariableStateMap","getVariableValuesKey","useAllVariableValues","TIME_SERIES_QUERY_KEY","getQueryOptions","plugin","definition","context","timeRange","suggestedStepMs","mode","variableState","dependencies","dependsOn","spec","variableDependencies","variables","filteredVariabledState","variablesValueKey","queryKey","waitToLoad","some","v","loading","queryEnabled","undefined","useTimeSeriesQuery","options","queryOptions","data","kind","useTimeSeriesQueryContext","enabled","queryFn","signal","Error","ctx","getTimeSeriesData","useTimeSeriesQueries","definitions","getPlugin","pluginLoaderResponse","map","d","queries","idx","absoluteTimeRange","datasourceStore","useActiveTimeSeriesQueries","queryClient","queryCache","getQueryCache","getActiveTimeSeriesQueries","cache","query","findAll","type","firstPart","startsWith","push"],"mappings":"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"}

package/dist/runtime/trace-queries.js

@@ -51,14 +51,15 @@ export const TRACE_QUERY_KEY = 'TraceQuery';
     });
 }
 function getQueryOptions({ plugin, definition, context }) {
-    const { datasourceStore, variableState, absoluteTimeRange } = context;
+    const { variableState, absoluteTimeRange } = context;
     const dependencies = plugin?.dependsOn ? plugin.dependsOn(definition.spec.plugin.spec, context) : {};
     const variableDependencies = dependencies?.variables;
     const filteredVariabledState = filterVariableStateMap(variableState, variableDependencies);
     const variablesValueKey = getVariableValuesKey(filteredVariabledState);
     const queryKey = [
+        'query',
+        TRACE_QUERY_KEY,
         definition,
-        datasourceStore,
         absoluteTimeRange,
         variablesValueKey
     ];

package/dist/runtime/trace-queries.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/runtime/trace-queries.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { QueryDefinition, UnknownSpec, TraceData } from '@perses-dev/core';\nimport { QueryKey, useQueries, UseQueryResult } from '@tanstack/react-query';\nimport { TraceQueryContext, TraceQueryPlugin } from '../model';\nimport { useDatasourceStore } from './datasources';\nimport { usePluginRegistry, usePlugins } from './plugin-registry';\nimport { useTimeRange } from './TimeRangeProvider';\nimport { useAllVariableValues } from './variables';\nimport { filterVariableStateMap, getVariableValuesKey } from './utils';\nexport type TraceQueryDefinition<PluginSpec = UnknownSpec> = QueryDefinition<'TraceQuery', PluginSpec>;\nexport const TRACE_QUERY_KEY = 'TraceQuery';\n\n/**\n * Run a trace query using a TraceQuery plugin and return the results\n * @param definitions: dashboard defintion for a trace query, written in Trace Query Language (TraceQL)\n * Documentation for TraceQL: https://grafana.com/docs/tempo/latest/traceql/\n */\nexport function useTraceQueries(definitions: TraceQueryDefinition[]): Array<UseQueryResult<TraceData>> {\n  const { getPlugin } = usePluginRegistry();\n  const context = useTraceQueryContext();\n\n  const pluginLoaderResponse = usePlugins(\n    'TraceQuery',\n    definitions.map((d) => ({ kind: d.spec.plugin.kind }))\n  );\n\n  // useQueries() handles data fetching from query plugins (e.g. traceQL queries, promQL queries)\n  // https://tanstack.com/query/v4/docs/react/reference/useQuery\n  return useQueries({\n    queries: definitions.map((definition, idx) => {\n      const plugin = pluginLoaderResponse[idx]?.data;\n      const { queryEnabled, queryKey } = getQueryOptions({ context, definition, plugin });\n      const traceQueryKind = definition?.spec?.plugin?.kind;\n      return {\n        enabled: queryEnabled,\n        queryKey: queryKey,\n        queryFn: async (): Promise<TraceData> => {\n          const plugin = await getPlugin(TRACE_QUERY_KEY, traceQueryKind);\n          const data = await plugin.getTraceData(definition.spec.plugin.spec, context);\n          return data;\n        },\n      };\n    }),\n  });\n}\n\nfunction getQueryOptions({\n  plugin,\n  definition,\n  context,\n}: {\n  plugin?: TraceQueryPlugin;\n  definition: TraceQueryDefinition;\n  context: TraceQueryContext;\n}): {\n  queryKey: QueryKey;\n  queryEnabled: boolean;\n} {\n  const { datasourceStore, variableState, absoluteTimeRange } = context;\n\n  const dependencies = plugin?.dependsOn ? plugin.dependsOn(definition.spec.plugin.spec, context) : {};\n  const variableDependencies = dependencies?.variables;\n\n  const filteredVariabledState = filterVariableStateMap(variableState, variableDependencies);\n  const variablesValueKey = getVariableValuesKey(filteredVariabledState);\n  const queryKey = [definition, datasourceStore, absoluteTimeRange, variablesValueKey] as const;\n\n  let waitToLoad = false;\n  if (variableDependencies) {\n    waitToLoad = variableDependencies.some((v) => variableState[v]?.loading);\n  }\n\n  const queryEnabled = plugin !== undefined && !waitToLoad;\n  return {\n    queryKey,\n    queryEnabled,\n  };\n}\n\nfunction useTraceQueryContext(): TraceQueryContext {\n  const { absoluteTimeRange } = useTimeRange();\n  const variableState = useAllVariableValues();\n  const datasourceStore = useDatasourceStore();\n\n  return {\n    variableState,\n    datasourceStore,\n    absoluteTimeRange,\n  };\n}\n"],"names":["useQueries","useDatasourceStore","usePluginRegistry","usePlugins","useTimeRange","useAllVariableValues","filterVariableStateMap","getVariableValuesKey","TRACE_QUERY_KEY","useTraceQueries","definitions","getPlugin","context","useTraceQueryContext","pluginLoaderResponse","map","d","kind","spec","plugin","queries","definition","idx","data","queryEnabled","queryKey","getQueryOptions","traceQueryKind","enabled","queryFn","getTraceData","datasourceStore","variableState","absoluteTimeRange","dependencies","dependsOn","variableDependencies","variables","filteredVariabledState","variablesValueKey","waitToLoad","some","v","loading","undefined"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAGjC,SAAmBA,UAAU,QAAwB,wBAAwB;AAE7E,SAASC,kBAAkB,QAAQ,gBAAgB;AACnD,SAASC,iBAAiB,EAAEC,UAAU,QAAQ,oBAAoB;AAClE,SAASC,YAAY,QAAQ,sBAAsB;AACnD,SAASC,oBAAoB,QAAQ,cAAc;AACnD,SAASC,sBAAsB,EAAEC,oBAAoB,QAAQ,UAAU;AAEvE,OAAO,MAAMC,kBAAkB,aAAa;AAE5C;;;;CAIC,GACD,OAAO,SAASC,gBAAgBC,WAAmC;IACjE,MAAM,EAAEC,SAAS,EAAE,GAAGT;IACtB,MAAMU,UAAUC;IAEhB,MAAMC,uBAAuBX,WAC3B,cACAO,YAAYK,GAAG,CAAC,CAACC,IAAO,CAAA;YAAEC,MAAMD,EAAEE,IAAI,CAACC,MAAM,CAACF,IAAI;QAAC,CAAA;IAGrD,+FAA+F;IAC/F,8DAA8D;IAC9D,OAAOjB,WAAW;QAChBoB,SAASV,YAAYK,GAAG,CAAC,CAACM,YAAYC;YACpC,MAAMH,SAASL,oBAAoB,CAACQ,IAAI,EAAEC;YAC1C,MAAM,EAAEC,YAAY,EAAEC,QAAQ,EAAE,GAAGC,gBAAgB;gBAAEd;gBAASS;gBAAYF;YAAO;YACjF,MAAMQ,iBAAiBN,YAAYH,MAAMC,QAAQF;YACjD,OAAO;gBACLW,SAASJ;gBACTC,UAAUA;gBACVI,SAAS;oBACP,MAAMV,SAAS,MAAMR,UAAUH,iBAAiBmB;oBAChD,MAAMJ,OAAO,MAAMJ,OAAOW,YAAY,CAACT,WAAWH,IAAI,CAACC,MAAM,CAACD,IAAI,EAAEN;oBACpE,OAAOW;gBACT;YACF;QACF;IACF;AACF;AAEA,SAASG,gBAAgB,EACvBP,MAAM,EACNE,UAAU,EACVT,OAAO,EAKR;IAIC,MAAM,EAAEmB,eAAe,EAAEC,aAAa,EAAEC,iBAAiB,EAAE,GAAGrB;IAE9D,MAAMsB,eAAef,QAAQgB,YAAYhB,OAAOgB,SAAS,CAACd,WAAWH,IAAI,CAACC,MAAM,CAACD,IAAI,EAAEN,WAAW,CAAC;IACnG,MAAMwB,uBAAuBF,cAAcG;IAE3C,MAAMC,yBAAyBhC,uBAAuB0B,eAAeI;IACrE,MAAMG,oBAAoBhC,qBAAqB+B;IAC/C,MAAMb,WAAW;QAACJ;QAAYU;QAAiBE;QAAmBM;KAAkB;IAEpF,IAAIC,aAAa;IACjB,IAAIJ,sBAAsB;QACxBI,aAAaJ,qBAAqBK,IAAI,CAAC,CAACC,IAAMV,aAAa,CAACU,EAAE,EAAEC;IAClE;IAEA,MAAMnB,eAAeL,WAAWyB,aAAa,CAACJ;IAC9C,OAAO;QACLf;QACAD;IACF;AACF;AAEA,SAASX;IACP,MAAM,EAAEoB,iBAAiB,EAAE,GAAG7B;IAC9B,MAAM4B,gBAAgB3B;IACtB,MAAM0B,kBAAkB9B;IAExB,OAAO;QACL+B;QACAD;QACAE;IACF;AACF"}
+{"version":3,"sources":["../../src/runtime/trace-queries.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { QueryDefinition, UnknownSpec, TraceData } from '@perses-dev/core';\nimport { QueryKey, useQueries, UseQueryResult } from '@tanstack/react-query';\nimport { TraceQueryContext, TraceQueryPlugin } from '../model';\nimport { useDatasourceStore } from './datasources';\nimport { usePluginRegistry, usePlugins } from './plugin-registry';\nimport { useTimeRange } from './TimeRangeProvider';\nimport { useAllVariableValues } from './variables';\nimport { filterVariableStateMap, getVariableValuesKey } from './utils';\nexport type TraceQueryDefinition<PluginSpec = UnknownSpec> = QueryDefinition<'TraceQuery', PluginSpec>;\nexport const TRACE_QUERY_KEY = 'TraceQuery';\n\n/**\n * Run a trace query using a TraceQuery plugin and return the results\n * @param definitions: dashboard defintion for a trace query, written in Trace Query Language (TraceQL)\n * Documentation for TraceQL: https://grafana.com/docs/tempo/latest/traceql/\n */\nexport function useTraceQueries(definitions: TraceQueryDefinition[]): Array<UseQueryResult<TraceData>> {\n  const { getPlugin } = usePluginRegistry();\n  const context = useTraceQueryContext();\n\n  const pluginLoaderResponse = usePlugins(\n    'TraceQuery',\n    definitions.map((d) => ({ kind: d.spec.plugin.kind }))\n  );\n\n  // useQueries() handles data fetching from query plugins (e.g. traceQL queries, promQL queries)\n  // https://tanstack.com/query/v4/docs/react/reference/useQuery\n  return useQueries({\n    queries: definitions.map((definition, idx) => {\n      const plugin = pluginLoaderResponse[idx]?.data;\n      const { queryEnabled, queryKey } = getQueryOptions({ context, definition, plugin });\n      const traceQueryKind = definition?.spec?.plugin?.kind;\n      return {\n        enabled: queryEnabled,\n        queryKey: queryKey,\n        queryFn: async (): Promise<TraceData> => {\n          const plugin = await getPlugin(TRACE_QUERY_KEY, traceQueryKind);\n          const data = await plugin.getTraceData(definition.spec.plugin.spec, context);\n          return data;\n        },\n      };\n    }),\n  });\n}\n\nfunction getQueryOptions({\n  plugin,\n  definition,\n  context,\n}: {\n  plugin?: TraceQueryPlugin;\n  definition: TraceQueryDefinition;\n  context: TraceQueryContext;\n}): {\n  queryKey: QueryKey;\n  queryEnabled: boolean;\n} {\n  const { variableState, absoluteTimeRange } = context;\n\n  const dependencies = plugin?.dependsOn ? plugin.dependsOn(definition.spec.plugin.spec, context) : {};\n  const variableDependencies = dependencies?.variables;\n\n  const filteredVariabledState = filterVariableStateMap(variableState, variableDependencies);\n  const variablesValueKey = getVariableValuesKey(filteredVariabledState);\n  const queryKey = ['query', TRACE_QUERY_KEY, definition, absoluteTimeRange, variablesValueKey] as const;\n\n  let waitToLoad = false;\n  if (variableDependencies) {\n    waitToLoad = variableDependencies.some((v) => variableState[v]?.loading);\n  }\n\n  const queryEnabled = plugin !== undefined && !waitToLoad;\n  return {\n    queryKey,\n    queryEnabled,\n  };\n}\n\nfunction useTraceQueryContext(): TraceQueryContext {\n  const { absoluteTimeRange } = useTimeRange();\n  const variableState = useAllVariableValues();\n  const datasourceStore = useDatasourceStore();\n\n  return {\n    variableState,\n    datasourceStore,\n    absoluteTimeRange,\n  };\n}\n"],"names":["useQueries","useDatasourceStore","usePluginRegistry","usePlugins","useTimeRange","useAllVariableValues","filterVariableStateMap","getVariableValuesKey","TRACE_QUERY_KEY","useTraceQueries","definitions","getPlugin","context","useTraceQueryContext","pluginLoaderResponse","map","d","kind","spec","plugin","queries","definition","idx","data","queryEnabled","queryKey","getQueryOptions","traceQueryKind","enabled","queryFn","getTraceData","variableState","absoluteTimeRange","dependencies","dependsOn","variableDependencies","variables","filteredVariabledState","variablesValueKey","waitToLoad","some","v","loading","undefined","datasourceStore"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAGjC,SAAmBA,UAAU,QAAwB,wBAAwB;AAE7E,SAASC,kBAAkB,QAAQ,gBAAgB;AACnD,SAASC,iBAAiB,EAAEC,UAAU,QAAQ,oBAAoB;AAClE,SAASC,YAAY,QAAQ,sBAAsB;AACnD,SAASC,oBAAoB,QAAQ,cAAc;AACnD,SAASC,sBAAsB,EAAEC,oBAAoB,QAAQ,UAAU;AAEvE,OAAO,MAAMC,kBAAkB,aAAa;AAE5C;;;;CAIC,GACD,OAAO,SAASC,gBAAgBC,WAAmC;IACjE,MAAM,EAAEC,SAAS,EAAE,GAAGT;IACtB,MAAMU,UAAUC;IAEhB,MAAMC,uBAAuBX,WAC3B,cACAO,YAAYK,GAAG,CAAC,CAACC,IAAO,CAAA;YAAEC,MAAMD,EAAEE,IAAI,CAACC,MAAM,CAACF,IAAI;QAAC,CAAA;IAGrD,+FAA+F;IAC/F,8DAA8D;IAC9D,OAAOjB,WAAW;QAChBoB,SAASV,YAAYK,GAAG,CAAC,CAACM,YAAYC;YACpC,MAAMH,SAASL,oBAAoB,CAACQ,IAAI,EAAEC;YAC1C,MAAM,EAAEC,YAAY,EAAEC,QAAQ,EAAE,GAAGC,gBAAgB;gBAAEd;gBAASS;gBAAYF;YAAO;YACjF,MAAMQ,iBAAiBN,YAAYH,MAAMC,QAAQF;YACjD,OAAO;gBACLW,SAASJ;gBACTC,UAAUA;gBACVI,SAAS;oBACP,MAAMV,SAAS,MAAMR,UAAUH,iBAAiBmB;oBAChD,MAAMJ,OAAO,MAAMJ,OAAOW,YAAY,CAACT,WAAWH,IAAI,CAACC,MAAM,CAACD,IAAI,EAAEN;oBACpE,OAAOW;gBACT;YACF;QACF;IACF;AACF;AAEA,SAASG,gBAAgB,EACvBP,MAAM,EACNE,UAAU,EACVT,OAAO,EAKR;IAIC,MAAM,EAAEmB,aAAa,EAAEC,iBAAiB,EAAE,GAAGpB;IAE7C,MAAMqB,eAAed,QAAQe,YAAYf,OAAOe,SAAS,CAACb,WAAWH,IAAI,CAACC,MAAM,CAACD,IAAI,EAAEN,WAAW,CAAC;IACnG,MAAMuB,uBAAuBF,cAAcG;IAE3C,MAAMC,yBAAyB/B,uBAAuByB,eAAeI;IACrE,MAAMG,oBAAoB/B,qBAAqB8B;IAC/C,MAAMZ,WAAW;QAAC;QAASjB;QAAiBa;QAAYW;QAAmBM;KAAkB;IAE7F,IAAIC,aAAa;IACjB,IAAIJ,sBAAsB;QACxBI,aAAaJ,qBAAqBK,IAAI,CAAC,CAACC,IAAMV,aAAa,CAACU,EAAE,EAAEC;IAClE;IAEA,MAAMlB,eAAeL,WAAWwB,aAAa,CAACJ;IAC9C,OAAO;QACLd;QACAD;IACF;AACF;AAEA,SAASX;IACP,MAAM,EAAEmB,iBAAiB,EAAE,GAAG5B;IAC9B,MAAM2B,gBAAgB1B;IACtB,MAAMuC,kBAAkB3C;IAExB,OAAO;QACL8B;QACAa;QACAZ;IACF;AACF"}

package/dist/test/utils.js

@@ -14,7 +14,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { DEFAULT_DASHBOARD_DURATION } from '@perses-dev/core';
 import { PluginRegistry } from '../components';
-import { TimeRangeProvider } from '../runtime';
+import { TimeRangeProviderBasic } from '../runtime';
 import { testPluginLoader } from './test-plugins';
 export function getTestContextWrapper(contextOptions) {
     // Create a new QueryClient for each test to avoid caching issues
@@ -31,10 +31,10 @@ export function getTestContextWrapper(contextOptions) {
         end: new Date()
     };
     return function Wrapper({ children }) {
-        return /*#__PURE__*/ _jsx(TimeRangeProvider, {
-            timeRange: timeRange,
-            children: /*#__PURE__*/ _jsx(QueryClientProvider, {
-                client: queryClient,
+        return /*#__PURE__*/ _jsx(QueryClientProvider, {
+            client: queryClient,
+            children: /*#__PURE__*/ _jsx(TimeRangeProviderBasic, {
+                initialTimeRange: timeRange,
                 children: /*#__PURE__*/ _jsx(PluginRegistry, {
                     pluginLoader: testPluginLoader,
                     defaultPluginKinds: contextOptions?.defaultPluginKinds ?? {

package/dist/test/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/test/utils.tsx"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { QueryClient, QueryClientProvider } from '@tanstack/react-query';\nimport { ReactNode } from 'react';\nimport { DEFAULT_DASHBOARD_DURATION } from '@perses-dev/core';\nimport { PluginRegistry } from '../components';\nimport { DefaultPluginKinds } from '../model';\nimport { TimeRangeProvider } from '../runtime';\nimport { testPluginLoader } from './test-plugins';\n\nexport type ContextOptions = {\n  defaultPluginKinds?: DefaultPluginKinds;\n};\n\nexport function getTestContextWrapper(contextOptions?: ContextOptions) {\n  // Create a new QueryClient for each test to avoid caching issues\n  const queryClient = new QueryClient({\n    defaultOptions: { queries: { refetchOnWindowFocus: false, retry: false } },\n  });\n\n  const timeRange = { start: new Date(Date.now() - Number(DEFAULT_DASHBOARD_DURATION)), end: new Date() };\n  return function Wrapper({ children }: { children: ReactNode }): ReactNode {\n    return (\n      <TimeRangeProvider timeRange={timeRange}>\n        <QueryClientProvider client={queryClient}>\n          <PluginRegistry\n            pluginLoader={testPluginLoader}\n            defaultPluginKinds={\n              contextOptions?.defaultPluginKinds ?? {\n                TimeSeriesQuery: 'PrometheusTimeSeriesQuery',\n              }\n            }\n          >\n            {children}\n          </PluginRegistry>\n        </QueryClientProvider>\n      </TimeRangeProvider>\n    );\n  };\n}\n"],"names":["QueryClient","QueryClientProvider","DEFAULT_DASHBOARD_DURATION","PluginRegistry","TimeRangeProvider","testPluginLoader","getTestContextWrapper","contextOptions","queryClient","defaultOptions","queries","refetchOnWindowFocus","retry","timeRange","start","Date","now","Number","end","Wrapper","children","client","pluginLoader","defaultPluginKinds","TimeSeriesQuery"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;AAEjC,SAASA,WAAW,EAAEC,mBAAmB,QAAQ,wBAAwB;AAEzE,SAASC,0BAA0B,QAAQ,mBAAmB;AAC9D,SAASC,cAAc,QAAQ,gBAAgB;AAE/C,SAASC,iBAAiB,QAAQ,aAAa;AAC/C,SAASC,gBAAgB,QAAQ,iBAAiB;AAMlD,OAAO,SAASC,sBAAsBC,cAA+B;IACnE,iEAAiE;IACjE,MAAMC,cAAc,IAAIR,YAAY;QAClCS,gBAAgB;YAAEC,SAAS;gBAAEC,sBAAsB;gBAAOC,OAAO;YAAM;QAAE;IAC3E;IAEA,MAAMC,YAAY;QAAEC,OAAO,IAAIC,KAAKA,KAAKC,GAAG,KAAKC,OAAOf;QAA8BgB,KAAK,IAAIH;IAAO;IACtG,OAAO,SAASI,QAAQ,EAAEC,QAAQ,EAA2B;QAC3D,qBACE,KAAChB;YAAkBS,WAAWA;sBAC5B,cAAA,KAACZ;gBAAoBoB,QAAQb;0BAC3B,cAAA,KAACL;oBACCmB,cAAcjB;oBACdkB,oBACEhB,gBAAgBgB,sBAAsB;wBACpCC,iBAAiB;oBACnB;8BAGDJ;;;;IAKX;AACF"}
+{"version":3,"sources":["../../src/test/utils.tsx"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { QueryClient, QueryClientProvider } from '@tanstack/react-query';\nimport { ReactNode } from 'react';\nimport { DEFAULT_DASHBOARD_DURATION } from '@perses-dev/core';\nimport { PluginRegistry } from '../components';\nimport { DefaultPluginKinds } from '../model';\nimport { TimeRangeProviderBasic } from '../runtime';\nimport { testPluginLoader } from './test-plugins';\n\nexport type ContextOptions = {\n  defaultPluginKinds?: DefaultPluginKinds;\n};\n\nexport function getTestContextWrapper(contextOptions?: ContextOptions) {\n  // Create a new QueryClient for each test to avoid caching issues\n  const queryClient = new QueryClient({\n    defaultOptions: { queries: { refetchOnWindowFocus: false, retry: false } },\n  });\n  const timeRange = { start: new Date(Date.now() - Number(DEFAULT_DASHBOARD_DURATION)), end: new Date() };\n\n  return function Wrapper({ children }: { children: ReactNode }): ReactNode {\n    return (\n      <QueryClientProvider client={queryClient}>\n        <TimeRangeProviderBasic initialTimeRange={timeRange}>\n          <PluginRegistry\n            pluginLoader={testPluginLoader}\n            defaultPluginKinds={\n              contextOptions?.defaultPluginKinds ?? {\n                TimeSeriesQuery: 'PrometheusTimeSeriesQuery',\n              }\n            }\n          >\n            {children}\n          </PluginRegistry>\n        </TimeRangeProviderBasic>\n      </QueryClientProvider>\n    );\n  };\n}\n"],"names":["QueryClient","QueryClientProvider","DEFAULT_DASHBOARD_DURATION","PluginRegistry","TimeRangeProviderBasic","testPluginLoader","getTestContextWrapper","contextOptions","queryClient","defaultOptions","queries","refetchOnWindowFocus","retry","timeRange","start","Date","now","Number","end","Wrapper","children","client","initialTimeRange","pluginLoader","defaultPluginKinds","TimeSeriesQuery"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;AAEjC,SAASA,WAAW,EAAEC,mBAAmB,QAAQ,wBAAwB;AAEzE,SAASC,0BAA0B,QAAQ,mBAAmB;AAC9D,SAASC,cAAc,QAAQ,gBAAgB;AAE/C,SAASC,sBAAsB,QAAQ,aAAa;AACpD,SAASC,gBAAgB,QAAQ,iBAAiB;AAMlD,OAAO,SAASC,sBAAsBC,cAA+B;IACnE,iEAAiE;IACjE,MAAMC,cAAc,IAAIR,YAAY;QAClCS,gBAAgB;YAAEC,SAAS;gBAAEC,sBAAsB;gBAAOC,OAAO;YAAM;QAAE;IAC3E;IACA,MAAMC,YAAY;QAAEC,OAAO,IAAIC,KAAKA,KAAKC,GAAG,KAAKC,OAAOf;QAA8BgB,KAAK,IAAIH;IAAO;IAEtG,OAAO,SAASI,QAAQ,EAAEC,QAAQ,EAA2B;QAC3D,qBACE,KAACnB;YAAoBoB,QAAQb;sBAC3B,cAAA,KAACJ;gBAAuBkB,kBAAkBT;0BACxC,cAAA,KAACV;oBACCoB,cAAclB;oBACdmB,oBACEjB,gBAAgBiB,sBAAsB;wBACpCC,iBAAiB;oBACnB;8BAGDL;;;;IAKX;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@perses-dev/plugin-system",
-  "version": "0.53.0-beta.1",
+  "version": "0.53.0-beta.2",
   "description": "The plugin feature in Pereses",
   "license": "Apache-2.0",
   "homepage": "https://github.com/perses/perses/blob/main/README.md",
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "@module-federation/enhanced": "^0.19.1",
-    "@perses-dev/components": "0.53.0-beta.1",
-    "@perses-dev/core": "0.53.0-beta.1",
+    "@perses-dev/components": "0.53.0-beta.2",
+    "@perses-dev/core": "0.53.0-beta.2",
     "date-fns": "^4.1.0",
     "date-fns-tz": "^3.2.0",
     "immer": "^10.1.1",

package/dist/runtime/TimeRangeProvider/TimeRangeProviderWithQueryParams.d.ts

@@ -1,9 +0,0 @@
-import { DurationString, TimeRangeValue } from '@perses-dev/core';
-import React, { ReactElement } from 'react';
-export interface TimeRangeFromQueryProps {
-    initialTimeRange: TimeRangeValue;
-    initialRefreshInterval?: DurationString;
-    children?: React.ReactNode;
-}
-export declare function TimeRangeProviderWithQueryParams(props: TimeRangeFromQueryProps): ReactElement;
-//# sourceMappingURL=TimeRangeProviderWithQueryParams.d.ts.map

package/dist/runtime/TimeRangeProvider/TimeRangeProviderWithQueryParams.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"TimeRangeProviderWithQueryParams.d.ts","sourceRoot":"","sources":["../../../src/runtime/TimeRangeProvider/TimeRangeProviderWithQueryParams.tsx"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,KAAK,EAAE,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAI5C,MAAM,WAAW,uBAAuB;IACtC,gBAAgB,EAAE,cAAc,CAAC;IACjC,sBAAsB,CAAC,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,uBAAuB,GAAG,YAAY,CAgB7F"}

package/dist/runtime/TimeRangeProvider/TimeRangeProviderWithQueryParams.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/runtime/TimeRangeProvider/TimeRangeProviderWithQueryParams.tsx"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { DurationString, TimeRangeValue } from '@perses-dev/core';\nimport React, { ReactElement } from 'react';\nimport { TimeRangeProvider } from './TimeRangeProvider';\nimport { useSetRefreshIntervalParams, useTimeRangeParams } from './query-params';\n\nexport interface TimeRangeFromQueryProps {\n  initialTimeRange: TimeRangeValue;\n  initialRefreshInterval?: DurationString;\n  children?: React.ReactNode;\n}\n\nexport function TimeRangeProviderWithQueryParams(props: TimeRangeFromQueryProps): ReactElement {\n  const { initialTimeRange, initialRefreshInterval, children } = props;\n\n  const { timeRange, setTimeRange } = useTimeRangeParams(initialTimeRange);\n  const { refreshInterval, setRefreshInterval } = useSetRefreshIntervalParams(initialRefreshInterval);\n\n  return (\n    <TimeRangeProvider\n      timeRange={timeRange}\n      refreshInterval={refreshInterval}\n      setTimeRange={setTimeRange}\n      setRefreshInterval={setRefreshInterval}\n    >\n      {children}\n    </TimeRangeProvider>\n  );\n}\n"],"names":["React","TimeRangeProvider","useSetRefreshIntervalParams","useTimeRangeParams","TimeRangeProviderWithQueryParams","props","initialTimeRange","initialRefreshInterval","children","timeRange","setTimeRange","refreshInterval","setRefreshInterval"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;AAGjC,OAAOA,WAA6B,QAAQ;AAC5C,SAASC,iBAAiB,QAAQ,sBAAsB;AACxD,SAASC,2BAA2B,EAAEC,kBAAkB,QAAQ,iBAAiB;AAQjF,OAAO,SAASC,iCAAiCC,KAA8B;IAC7E,MAAM,EAAEC,gBAAgB,EAAEC,sBAAsB,EAAEC,QAAQ,EAAE,GAAGH;IAE/D,MAAM,EAAEI,SAAS,EAAEC,YAAY,EAAE,GAAGP,mBAAmBG;IACvD,MAAM,EAAEK,eAAe,EAAEC,kBAAkB,EAAE,GAAGV,4BAA4BK;IAE5E,qBACE,KAACN;QACCQ,WAAWA;QACXE,iBAAiBA;QACjBD,cAAcA;QACdE,oBAAoBA;kBAEnBJ;;AAGP"}