Skip to content
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

ref(suspect-commits): Add hook #14057

Merged
merged 3 commits into from
Jul 19, 2019
Merged

ref(suspect-commits): Add hook #14057

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
f802e98
Add hook
maheskett Jul 17, 2019
470d7e0
Fix button focus color
maheskett Jul 17, 2019
30712a4
Use hook component
maheskett Jul 17, 2019
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
10 changes: 8 additions & 2 deletions src/sentry/static/sentry/app/components/events/eventCauseEmpty.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,13 @@ class EventCauseEmpty extends React.Component {
<p>{t('Identify which commit caused this issue')}</p>
</Description>
<ButtonList>
<Button
<DocsButton
size="small"
priority="primary"
href="https://docs.sentry.io/workflow/releases/#create-release"
>
{t('Read the docs')}
</Button>
</DocsButton>

<div>
<Tooltip title={t('Remind me next week')}>
Expand Down Expand Up @@ -177,6 +177,12 @@ const ButtonList = styled('div')`
margin-bottom: 16px;
`;

const DocsButton = styled(Button)`
&:focus {
color: ${p => p.theme.white};
}
`;

const SnoozeButton = styled(Button)`
border-right: 0;
border-top-right-radius: 0;
Expand Down
19 changes: 9 additions & 10 deletions src/sentry/static/sentry/app/components/events/eventEntries.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ import {logException} from 'app/utils/logging';
import {objectIsEmpty} from 'app/utils';
import {t} from 'app/locale';
import BreadcrumbsInterface from 'app/components/events/interfaces/breadcrumbs';
import ConfigStore from 'app/stores/configStore';
import CspInterface from 'app/components/events/interfaces/csp';
import DebugMetaInterface from 'app/components/events/interfaces/debugmeta';
import EventAttachments from 'app/components/events/eventAttachments';
import EventCause from 'app/components/events/eventCause';
import EventCauseEmpty from 'app/components/events/eventCauseEmpty';
import EventContextSummary from 'app/components/events/contextSummary';
import EventContexts from 'app/components/events/contexts';
import EventDataSection from 'app/components/events/eventDataSection';
Expand All @@ -27,6 +25,7 @@ import EventTags from 'app/components/events/eventTags';
import EventUserFeedback from 'app/components/events/userFeedback';
import ExceptionInterface from 'app/components/events/interfaces/exception';
import GenericInterface from 'app/components/events/interfaces/generic';
import HookOrDefault from 'app/components/hookOrDefault';
import MessageInterface from 'app/components/events/interfaces/message';
import RequestInterface from 'app/components/events/interfaces/request';
import SentryTypes from 'app/sentryTypes';
Expand All @@ -51,6 +50,13 @@ export const INTERFACES = {
debugmeta: DebugMetaInterface,
};

const EventCauseEmptyHook = HookOrDefault({
hookName: 'component:event-cause-empty',
defaultComponent: () => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be shortened to defaultComponent: () => null

Copy link
Member

@evanpurkhiser evanpurkhiser Jul 17, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you don't need HookOrDefault and can just use app/components/Hook

return null;
},
});

class EventEntries extends React.Component {
static propTypes = {
// organization is not provided in the shared issue view
Expand Down Expand Up @@ -100,11 +106,6 @@ class EventEntries extends React.Component {
});
}

get isSuperUser() {
const user = ConfigStore.get('user');
return user && user.isSuperuser;
}

renderEntries() {
const {event, project, isShare} = this.props;

Expand Down Expand Up @@ -173,9 +174,7 @@ class EventEntries extends React.Component {
{!objectIsEmpty(event.errors) && <EventErrors event={event} />}{' '}
{!isShare &&
(showExampleCommit ? (
this.isSuperUser && (
<EventCauseEmpty organization={organization} project={project} />
)
<EventCauseEmptyHook organization={organization} project={project} />
) : (
<EventCause event={event} orgId={orgId} projectId={project.slug} />
))}
Expand Down
1 change: 1 addition & 0 deletions src/sentry/static/sentry/app/stores/hookStore.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const validHookNames = new Set([
'component:org-members-view',
'component:header-date-range',
'component:header-selector-items',
'component:event-cause-empty',

// Additional settings
'settings:organization-navigation',
Expand Down
32 changes: 0 additions & 32 deletions tests/js/spec/views/organizationGroupDetails/groupEventDetails.spec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {mount} from 'enzyme';
import {browserHistory} from 'react-router';

import {initializeOrg} from 'app-test/helpers/initializeOrg';
import ConfigStore from 'app/stores/configStore';
import {GroupEventDetails} from 'app/views/organizationGroupDetails/groupEventDetails';

describe('groupEventDetails', () => {
Expand Down Expand Up @@ -243,37 +242,6 @@ describe('groupEventDetails', () => {
expect(wrapper.find('EventCause').exists()).toBe(false);
});

it('renders suspect commit empty state for super users', async function() {
ConfigStore.set('user', TestStubs.User({isSuperuser: true}));
MockApiClient.addMockResponse({
url: `/projects/${org.slug}/${project.slug}/releases/completion/`,
body: [
{
step: 'commit',
complete: false,
},
],
});

const wrapper = mount(
<GroupEventDetails
api={new MockApiClient()}
group={group}
project={project}
organization={org}
environments={[{id: '1', name: 'dev', displayName: 'Dev'}]}
params={{orgId: org.slug, groupId: group.id, eventId: '1'}}
location={{query: {environment: 'dev'}}}
/>,
routerContext
);
await tick();
wrapper.update();

expect(wrapper.find('EventCauseEmpty').exists()).toBe(true);
expect(wrapper.find('EventCause').exists()).toBe(false);
});

it('renders suspect commit', async function() {
MockApiClient.addMockResponse({
url: `/projects/${org.slug}/${project.slug}/releases/completion/`,
Expand Down