From 916bff6f1a330e0b932284e1404a95589b8e778c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bazyli=20Brz=C3=B3ska?= Date: Mon, 3 Jun 2024 18:36:14 -0700 Subject: [PATCH] fix: misc fixes --- src/stories/mockComponents/TicketView.tsx | 29 +++++++++++------------ src/v2/sanitizeUrlForTracing.ts | 1 + 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/stories/mockComponents/TicketView.tsx b/src/stories/mockComponents/TicketView.tsx index 1cf6d90..df3713f 100644 --- a/src/stories/mockComponents/TicketView.tsx +++ b/src/stories/mockComponents/TicketView.tsx @@ -1,16 +1,17 @@ import React, { useEffect } from 'react' +import styled from 'styled-components' +import { Timeline } from '@zendeskgarden/react-accordions' +import { Avatar } from '@zendeskgarden/react-avatars' import { Skeleton } from '@zendeskgarden/react-loaders' import { Well } from '@zendeskgarden/react-notifications' -import { Paragraph, Span, XXL } from '@zendeskgarden/react-typography' -import { Timeline } from '@zendeskgarden/react-accordions' -import styled from 'styled-components' -import { mockTickets } from './mockTickets' import { DEFAULT_THEME, PALETTE } from '@zendeskgarden/react-theming' -import { Avatar } from '@zendeskgarden/react-avatars' +import { Paragraph, Span, XXL } from '@zendeskgarden/react-typography' import { ReactComponent as UserIcon } from '@zendeskgarden/svg-icons/src/16/user-solo-stroke.svg' +import { VISIBLE_STATE } from '../../main' +import { TimingComponent } from '../../v2/element' import { useCaptureRenderBeaconTask } from '../../v2/hooks' +import { mockTickets } from './mockTickets' import { operationManager } from './operationManager' -import { TimingComponent } from '../../v2/element' export const StyledSpan = styled(Span).attrs({ isBold: true, hue: 'blue' })` margin-left: ${DEFAULT_THEME.space.base * 2}px; @@ -33,21 +34,19 @@ export const TicketView: React.FC = ({ cached = false, onLoaded, }) => { - useCaptureRenderBeaconTask( - { - componentName: 'TicketView', - metadata: { ticketId, loading: !cached }, - state: cached ? 'complete' : 'loading', - operationManager, - }, - [ticketId], - ) + useCaptureRenderBeaconTask({ + componentName: 'TicketView', + metadata: { ticketId, loading: !cached }, + visibleState: cached ? VISIBLE_STATE.COMPLETE : VISIBLE_STATE.LOADING, + operationManager, + }) const ticket = mockTickets.find((ticket) => ticket.id === ticketId) useEffect(() => { const timer = setTimeout(() => { onLoaded?.() + // eslint-disable-next-line no-magic-numbers }, 1_500) return () => void clearTimeout(timer) }, [ticketId]) diff --git a/src/v2/sanitizeUrlForTracing.ts b/src/v2/sanitizeUrlForTracing.ts index 8856bf9..0e7d874 100644 --- a/src/v2/sanitizeUrlForTracing.ts +++ b/src/v2/sanitizeUrlForTracing.ts @@ -41,6 +41,7 @@ export function sanitizeUrlForTracing(url: string): { let sanitizedUrl = commonUrl.replace(/\/\d+/g, '/$id') // replace UUIDs as well: sanitizedUrl = sanitizedUrl.replace( + // eslint-disable-next-line unicorn/better-regex /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/g, '$uuid', )