Skip to content

fix(coding-conventions): Make activity section icon component static #120047

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

Open
sentry wants to merge 3 commits into
base: master
Choose a base branch
from
+35 −42
Open

fix(coding-conventions): Make activity section icon component static #120047

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a24ece4
fix(coding-conventions): Make activity section icon component static
ryan953 Jul 19, 2026
fe6c622
:hammer_and_wrench: apply pre-commit fixes
getsantry[bot] Jul 19, 2026
7618fe7
fix: Update progressActivityTooltip to use renderIcon instead of comp…
cursoragent Jul 21, 2026
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
28 changes: 13 additions & 15 deletions static/app/views/issueDetails/activitySection/groupActivityIcons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ import {GroupActivityType} from 'sentry/types/group';
interface IconWithDefaultProps {
Component: React.ComponentType<SVGIconProps> | null;
defaultProps: {locked?: boolean; type?: string};
componentFunction?: (props: {
propsFunction?: (data: GroupActivity['data']) => Record<string, unknown>;
renderIcon?: (props: {
data: GroupActivity['data'];
sentry_app: GroupActivity['sentry_app'];
user: GroupActivity['user'];
}) => React.ComponentType<SVGIconProps>;
propsFunction?: (data: GroupActivity['data']) => Record<string, unknown>;
}) => React.ReactNode;
Comment thread
cursor[bot] marked this conversation as resolved.
}

export const groupActivityTypeIconMapping: Record<
Expand All @@ -59,13 +59,11 @@ export const groupActivityTypeIconMapping: Record<
[GroupActivityType.NOTE]: {
Component: IconChat,
defaultProps: {},
componentFunction: ({user, sentry_app}) => {
renderIcon: ({user, sentry_app}) => {
if (sentry_app) {
return function () {
return <SentryAppAvatar sentryApp={sentry_app} />;
};
return <SentryAppAvatar sentryApp={sentry_app} />;
}
return user ? () => <StyledUserAvatar user={user} /> : IconChat;
return user ? <StyledUserAvatar user={user} /> : <IconChat size="xs" />;
},
},
[GroupActivityType.SET_RESOLVED]: {Component: IconCheckmark, defaultProps: {}},
Comment thread
sentry[bot] marked this conversation as resolved.
Expand Down Expand Up @@ -109,21 +107,21 @@ export const groupActivityTypeIconMapping: Record<
[GroupActivityType.SET_REGRESSION]: {Component: IconFire, defaultProps: {}},
[GroupActivityType.CREATE_ISSUE]: {
Component: IconAdd,
componentFunction: ({data}) => {
renderIcon: ({data}) => {
const provider = (data as GroupActivityCreateIssue['data']).provider;
switch (provider) {
case 'GitHub':
return IconGithub;
return <IconGithub size="xs" />;
case 'GitLab':
return IconGitlab;
return <IconGitlab size="xs" />;
case 'Bitbucket':
return IconBitbucket;
return <IconBitbucket size="xs" />;
case 'Jira':
return IconJira;
return <IconJira size="xs" />;
case 'Asana':
return IconAsana;
return <IconAsana size="xs" />;
default:
return IconAdd;
return <IconAdd size="xs" />;
}
},
defaultProps: {},
Expand Down
24 changes: 11 additions & 13 deletions static/app/views/issueDetails/activitySection/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,20 @@ function LegacyTimelineItem({
);

const iconMapping = groupActivityTypeIconMapping[item.type];
const componentFunction = iconMapping?.componentFunction;
const Icon = componentFunction
? componentFunction({
const Icon = iconMapping?.Component ?? null;
const iconNode = iconMapping?.renderIcon
? iconMapping.renderIcon({
data: item.data,
user: item.user,
sentry_app: item.sentry_app,
})
: (iconMapping?.Component ?? null);
: Icon && (
<Icon
{...iconMapping.defaultProps}
{...iconMapping.propsFunction?.(item.data)}
size="xs"
/>
);

return (
<ActivityTimelineItem
Expand All @@ -160,15 +166,7 @@ function LegacyTimelineItem({
</TitleRow>
}
timestamp={<Timestamp date={item.dateCreated} unitStyle={timestampUnitStyle} />}
icon={
Icon && (
<Icon
{...iconMapping.defaultProps}
{...iconMapping.propsFunction?.(item.data)}
size="xs"
/>
)
}
icon={iconNode}
>
{item.type === GroupActivityType.NOTE && editing ? (
<ActivityNoteInput
Expand Down
Loading