Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions static/app/types/group.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -617,12 +617,20 @@ interface GroupActivitySetByResolvedInNextSemverRelease extends GroupActivityBas
data: {
// Set for semver releases
current_release_version: string;
inNextRelease?: boolean;
integration_id?: number;
provider?: string;
provider_key?: string;
};
type: GroupActivityType.SET_RESOLVED_IN_RELEASE;
}

interface GroupActivitySetByResolvedInRelease extends GroupActivityBase {
data: {
inNextRelease?: boolean;
integration_id?: number;
provider?: string;
provider_key?: string;
version?: string;
};
type: GroupActivityType.SET_RESOLVED_IN_RELEASE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -329,4 +329,52 @@ describe('StreamlinedActivitySection', () => {
}
}
});

it('renders resolved in release with integration', async () => {
const resolvedGroup = GroupFixture({
id: '1339',
activity: [
{
type: GroupActivityType.SET_RESOLVED_IN_RELEASE,
id: 'resolved-in-release-1',
dateCreated: '2020-01-01T00:00:00',
data: {
version: 'frontend@1.0.0',
integration_id: 408,
provider: 'Jira Server',
provider_key: 'jira_server',
},
user,
},
],
project,
});

render(<StreamlinedActivitySection group={resolvedGroup} />);
expect(await screen.findByText('Resolved')).toBeInTheDocument();
expect(screen.getByRole('link', {name: '1.0.0'})).toBeInTheDocument();
expect(screen.getByRole('link', {name: 'Jira Server'})).toBeInTheDocument();
});

it('renders resolved in release without integration', async () => {
const resolvedGroup = GroupFixture({
id: '1340',
activity: [
{
type: GroupActivityType.SET_RESOLVED_IN_RELEASE,
id: 'resolved-in-release-2',
dateCreated: '2020-01-01T00:00:00',
data: {
version: 'frontend@1.0.0',
},
user,
},
],
project,
});

render(<StreamlinedActivitySection group={resolvedGroup} />);
expect(await screen.findByText('Resolved')).toBeInTheDocument();
expect(screen.getByRole('link', {name: '1.0.0'})).toBeInTheDocument();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -284,26 +284,67 @@ export default function getGroupActivityItem(
}),
};
case GroupActivityType.SET_RESOLVED_IN_RELEASE: {
// Resolved in the next release
const hasIntegration =
'integration_id' in activity.data && activity.data.integration_id;
const integrationLink = hasIntegration ? (
<Link
to={`/settings/${organization.slug}/integrations/${activity.data.provider_key}/${activity.data.integration_id}/`}
>
{activity.data.provider}
</Link>
) : null;

if ('current_release_version' in activity.data) {
const currentVersion = activity.data.current_release_version;
return {
title: t('Resolved'),
message: tct('by [author] in releases greater than [version] [semver]', {
author,
version: <ActivityRelease project={project} version={currentVersion} />,
semver: isSemverRelease(currentVersion) ? t('(semver)') : t('(non-semver)'),
}),
message: hasIntegration
? tct(
'by [author] in releases greater than [version] [semver] via [integration]',
{
author,
version: (
<ActivityRelease project={project} version={currentVersion} />
),
semver: isSemverRelease(currentVersion)
? t('(semver)')
: t('(non-semver)'),
integration: integrationLink,
}
)
: tct('by [author] in releases greater than [version] [semver]', {
author,
version: <ActivityRelease project={project} version={currentVersion} />,
semver: isSemverRelease(currentVersion)
? t('(semver)')
: t('(non-semver)'),
}),
};
}
const version = activity.data.version;
if (version) {
return {
title: t('Resolved'),
message: hasIntegration
? tct('by [author] in [version] [semver] via [integration]', {
author,
version: <ActivityRelease project={project} version={version} />,
semver: isSemverRelease(version) ? t('(semver)') : t('(non-semver)'),
integration: integrationLink,
})
: tct('by [author] in [version] [semver]', {
author,
version: <ActivityRelease project={project} version={version} />,
semver: isSemverRelease(version) ? t('(semver)') : t('(non-semver)'),
}),
};
}
return {
title: t('Resolved'),
message: version
? tct('by [author] in [version] [semver]', {
message: hasIntegration
? tct('by [author] in the upcoming release via [integration]', {
author,
version: <ActivityRelease project={project} version={version} />,
semver: isSemverRelease(version) ? t('(semver)') : t('(non-semver)'),
integration: integrationLink,
})
: tct('by [author] in the upcoming release', {
author,
Expand Down
Loading