Compare commits
3 Commits
65dc9fcaf0
...
bur-63
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
095df38e7e | ||
| 46cf3da755 | |||
|
|
7f0e531711 |
@@ -3,6 +3,6 @@ import { cloudApiUrl } from '../../shared/config/env';
|
|||||||
import type { HistoryRequest, HistoryResponse } from './types';
|
import type { HistoryRequest, HistoryResponse } from './types';
|
||||||
|
|
||||||
/** Запрашивает исторический ряд с avg-линией и min/max-диапазоном для графика. */
|
/** Запрашивает исторический ряд с avg-линией и min/max-диапазоном для графика. */
|
||||||
export function getHistory(params: HistoryRequest): Promise<HistoryResponse> {
|
export function getHistory(params: HistoryRequest, signal?: AbortSignal): Promise<HistoryResponse> {
|
||||||
return getJson<HistoryResponse>(cloudApiUrl, '/history', params);
|
return getJson<HistoryResponse>(cloudApiUrl, '/history', params, { signal });
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -202,7 +202,12 @@ export function ArchiveView({
|
|||||||
) : null}
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="archive-chart">
|
<div
|
||||||
|
className="archive-chart"
|
||||||
|
onFocusCapture={() => setSelectorOpen(false)}
|
||||||
|
onPointerDown={() => setSelectorOpen(false)}
|
||||||
|
onPointerEnter={() => setSelectorOpen(false)}
|
||||||
|
>
|
||||||
<div className="toolbar">
|
<div className="toolbar">
|
||||||
<div className="segmented">
|
<div className="segmented">
|
||||||
{RANGE_PRESETS.map((preset) => (
|
{RANGE_PRESETS.map((preset) => (
|
||||||
@@ -249,7 +254,7 @@ export function ArchiveView({
|
|||||||
|
|
||||||
{selectedTags.length ? (
|
{selectedTags.length ? (
|
||||||
<HistoryChart
|
<HistoryChart
|
||||||
key={`${range.from}:${range.to}:${selectedTags.join(',')}`}
|
key={`${range.from}:${range.to}:${historyAxis.granulate}`}
|
||||||
edge={edgeId}
|
edge={edgeId}
|
||||||
from={fromIso}
|
from={fromIso}
|
||||||
to={toIso}
|
to={toIso}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ export function useHistoryChartQueries({
|
|||||||
const queries = useQueries({
|
const queries = useQueries({
|
||||||
queries: tags.map((tag) => ({
|
queries: tags.map((tag) => ({
|
||||||
queryKey: ['history', edge, tag, from, to, granulate],
|
queryKey: ['history', edge, tag, from, to, granulate],
|
||||||
queryFn: () => getHistory({ edge, tag, from, to, granulate }),
|
queryFn: ({ signal }: { signal: AbortSignal }) => getHistory({ edge, tag, from, to, granulate }, signal),
|
||||||
enabled,
|
enabled,
|
||||||
})),
|
})),
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user