From 0d9bde27dee00db3ddd02d1bc671b9554c6b299f Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Fri, 9 May 2025 13:12:08 -0600 Subject: [PATCH] Update animate for trendlines --- web/playwright-tests/invite-user.test.ts | 6 ++++-- .../BusterChartJS/hooks/useTrendlines/useTrendlines.ts | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/web/playwright-tests/invite-user.test.ts b/web/playwright-tests/invite-user.test.ts index ef24e92bc..6877b4aec 100644 --- a/web/playwright-tests/invite-user.test.ts +++ b/web/playwright-tests/invite-user.test.ts @@ -19,10 +19,12 @@ test('Invite User', async ({ page }) => { await page.getByRole('button').filter({ hasText: /^$/ }).first().click(); await page.getByRole('link', { name: 'Users' }).click(); - await page.waitForTimeout(1000); + await page.waitForTimeout(5000); await page.waitForLoadState('networkidle'); await page.waitForLoadState('domcontentloaded'); - await expect(page.getByRole('link', { name: 'nate+integration-test@buser.' })).toBeVisible(); + await expect(page.getByRole('link', { name: 'nate+integration-test@buser.' })).toBeVisible({ + timeout: 20000 + }); await expect(page.getByRole('main')).toMatchAriaSnapshot(` - img - text: nate+integration-test@buser.so Restricted Querier diff --git a/web/src/components/ui/charts/BusterChartJS/hooks/useTrendlines/useTrendlines.ts b/web/src/components/ui/charts/BusterChartJS/hooks/useTrendlines/useTrendlines.ts index d7c919cc4..96c71fa29 100644 --- a/web/src/components/ui/charts/BusterChartJS/hooks/useTrendlines/useTrendlines.ts +++ b/web/src/components/ui/charts/BusterChartJS/hooks/useTrendlines/useTrendlines.ts @@ -69,6 +69,7 @@ export const useTrendlines = ({ type: 'line', borderColor: trendline.trendLineColor || 'black', borderWidth: 1.5, + label: { content: labelContent, display: trendline.showTrendlineLabel, @@ -111,6 +112,7 @@ export const useTrendlines = ({ stack: id, tension: 0.25, order: -1, + animation: false, datalabels: showTrendlineLabel ? { ...defaultLabelOptionConfig, @@ -124,10 +126,11 @@ export const useTrendlines = ({ const trendlineLabel = trendlineLabelProp ? trendlineLabelProp : label[0].value; return `${trendlineLabel || 'Trendline'}`; }, + //@ts-ignore yAdjust: -10 } : undefined - }; + } satisfies ChartProps<'line'>['data']['datasets'][number]; } );