Skip to content

fix(structuredEventData): Move Wrapper component to module scope #120040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sentry wants to merge 1 commit into from
Closed

fix(structuredEventData): Move Wrapper component to module scope #120040

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 22 additions & 16 deletions static/app/components/structuredEventData/recursiveStructuredData.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,21 @@ function getTotalChildrenFromMeta(m: Record<any, any> | undefined): number | und
return typeof rootMeta?.len === 'number' ? rootMeta.len : undefined;
}

function Wrapper({
formattedObjectKey,
children,
}: {
children: React.ReactNode;
formattedObjectKey: React.ReactNode;
}) {
return (
<Fragment>
{formattedObjectKey}
{children}
</Fragment>
);
}

export function RecursiveStructuredData({
config,
meta,
Expand All @@ -57,20 +72,11 @@ export function RecursiveStructuredData({
</Fragment>
);

function Wrapper({children}: {children: React.ReactNode}) {
return (
<Fragment>
{formattedObjectKey}
{children}
</Fragment>
);
}

if (config?.isNull?.(value) || value === null) {
const nullValue = config?.renderNull?.(value) ?? String(value);

return (
<Wrapper>
<Wrapper formattedObjectKey={formattedObjectKey}>
<ValueNull data-test-id="value-null">
<AnnotatedValue
value={nullValue}
Expand All @@ -87,7 +93,7 @@ export function RecursiveStructuredData({
const booleanValue = config?.renderBoolean?.(value) ?? String(value);

return (
<Wrapper>
<Wrapper formattedObjectKey={formattedObjectKey}>
<ValueBoolean data-test-id="value-boolean">
<AnnotatedValue
value={booleanValue}
Expand All @@ -102,7 +108,7 @@ export function RecursiveStructuredData({

if (typeof value === 'number' || config?.isNumber?.(value)) {
return (
<Wrapper>
<Wrapper formattedObjectKey={formattedObjectKey}>
<ValueNumber data-test-id="value-number">
<AnnotatedValue
value={value}
Expand All @@ -120,7 +126,7 @@ export function RecursiveStructuredData({
const stringValue = config.renderString?.(value) ?? value;

return (
<Wrapper>
<Wrapper formattedObjectKey={formattedObjectKey}>
<ValueString data-test-id="value-string">
{'"'}
<AnnotatedValue
Expand All @@ -138,7 +144,7 @@ export function RecursiveStructuredData({

if (looksLikeStrippedValue(value)) {
return (
<Wrapper>
<Wrapper formattedObjectKey={formattedObjectKey}>
<ValueStrippedString>
<AnnotatedValue
value={value}
Expand All @@ -153,7 +159,7 @@ export function RecursiveStructuredData({

if (containsCRLF(value)) {
return (
<Wrapper>
<Wrapper formattedObjectKey={formattedObjectKey}>
<ValueMultiLineString data-test-id="value-multiline-string">
<AnnotatedValue
value={value}
Expand All @@ -167,7 +173,7 @@ export function RecursiveStructuredData({
}

return (
<Wrapper>
<Wrapper formattedObjectKey={formattedObjectKey}>
<span data-test-id="value-unformatted">
<AnnotatedValue
value={value}
Expand Down
Loading