fix when issues are empty

getsentry · Jun 11, 2019 · 6eb599d · 6eb599d
1 parent f31fd75
commit 6eb599d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/src/sentry/static/sentry/app/views/organizationIncidents/details/relatedIssues/index.jsx b/src/sentry/static/sentry/app/views/organizationIncidents/details/relatedIssues/index.jsx
@@ -31,6 +31,11 @@ const RelatedIssues = styled(
         <div className={className}>
           <IssuesFetcher api={api} issueIds={incident && incident.groups}>
             {({issues, loading, error}) => {
+              // If loading is finished, and there are no issues, do not display anythig
+              if (!loading && issues && issues.length === 0) {
+                return null;
+              }
+
               return (
                 <React.Fragment>
                   <SideHeader loading={loading}>

diff --git a/...try/static/sentry/app/views/organizationIncidents/details/relatedIssues/issuesFetcher.jsx b/...try/static/sentry/app/views/organizationIncidents/details/relatedIssues/issuesFetcher.jsx
@@ -25,12 +25,13 @@ class IssuesFetcher extends React.PureComponent {
 
   fetchData = async () => {
     const {api, issueIds} = this.props;
-    this.setState({loading: true});
 
     if (!issueIds) {
       return;
     }
 
+    this.setState({loading: true});
+
     try {
       const issues = await Promise.all(
         issueIds.map(issueId => findIssueById(api, issueId))

diff --git a/tests/js/spec/views/organizationIncidents/details/index.spec.jsx b/tests/js/spec/views/organizationIncidents/details/index.spec.jsx
@@ -204,4 +204,24 @@ describe('IncidentDetails', function() {
         .text()
     ).toBe('JAVASCRIPT-6QS');
   });
+
+  it('renders incident without issues', async function() {
+    MockApiClient.addMockResponse({
+      url: '/organizations/org-slug/incidents/123/',
+      body: {
+        ...mockIncident,
+        groups: [],
+      },
+    });
+
+    const wrapper = createWrapper();
+
+    expect(wrapper.find('RelatedIssues Placeholder')).toHaveLength(1);
+
+    await tick();
+    wrapper.update();
+
+    expect(wrapper.find('RelatedItem')).toHaveLength(0);
+    expect(wrapper.find('RelatedIssues Placeholder')).toHaveLength(0);
+  });
 });