From dc3358466a83bfa975abc52a805f171dc2df90da Mon Sep 17 00:00:00 2001 From: Brandon Reid Date: Mon, 18 Mar 2024 11:11:48 -0300 Subject: [PATCH 1/2] Fix: Use static polling interval for events --- src/factories/eventData.ts | 3 +-- src/models/RunGraph.ts | 1 + src/objects/config.ts | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/factories/eventData.ts b/src/factories/eventData.ts index 536656b4..d05a1146 100644 --- a/src/factories/eventData.ts +++ b/src/factories/eventData.ts @@ -1,5 +1,4 @@ import { MaybeRefOrGetter, toValue } from 'vue' -import { getIntervalForDataSize } from '@/factories/data' import { RunGraphEvent, RunGraphFetchEventsOptions } from '@/models' import { waitForConfig } from '@/objects/config' import { waitForRunData } from '@/objects/nodes' @@ -28,7 +27,7 @@ export async function eventDataFactory( } if (!runGraphData.end_time) { - interval = setTimeout(() => start(), getIntervalForDataSize(runGraphData)) + interval = setTimeout(() => start(), config.fetchEventsInterval) } } diff --git a/src/models/RunGraph.ts b/src/models/RunGraph.ts index 31bbf598..1e3a169f 100644 --- a/src/models/RunGraph.ts +++ b/src/models/RunGraph.ts @@ -123,6 +123,7 @@ export type RunGraphConfig = { runId: string, fetch: RunGraphFetch, fetchEvents?: RunGraphFetchEvents, + fetchEventsInterval?: number, animationDuration?: number, styles?: RunGraphStyles, disableAnimationsThreshold?: number, diff --git a/src/objects/config.ts b/src/objects/config.ts index a985989a..19fdf475 100644 --- a/src/objects/config.ts +++ b/src/objects/config.ts @@ -11,6 +11,7 @@ const defaults: Omit = { disableAnimationsThreshold: 500, disableEdgesThreshold: 500, fetchEvents: () => [], + fetchEventsInterval: 30000, styles: { colorMode: 'dark', rowGap: 24, From 3bd1aad48b02c2f55b8aa9a686a8a434aba04af3 Mon Sep 17 00:00:00 2001 From: Craig Harshbarger Date: Mon, 18 Mar 2024 11:26:20 -0500 Subject: [PATCH 2/2] use clearTimeout rather than clearInterval --- src/factories/data.ts | 2 +- src/factories/eventData.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/factories/data.ts b/src/factories/data.ts index 43f6bcda..46333cff 100644 --- a/src/factories/data.ts +++ b/src/factories/data.ts @@ -27,7 +27,7 @@ export async function dataFactory(runId: string, callback: DataCallback) { // todo: need a global way of stopping this when the graph is stopped function stop(): void { - clearInterval(interval) + clearTimeout(interval) } return { diff --git a/src/factories/eventData.ts b/src/factories/eventData.ts index d05a1146..69d05ae3 100644 --- a/src/factories/eventData.ts +++ b/src/factories/eventData.ts @@ -33,7 +33,7 @@ export async function eventDataFactory( // todo: need a global way of stopping this when the graph is stopped function stop(): void { - clearInterval(interval) + clearTimeout(interval) } return {