more cleanup

getsentry · Sep 27, 2024 · 12da6b5 · 12da6b5
1 parent 01c206f
commit 12da6b5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 30 deletions.
diff --git a/static/app/components/events/eventAttachments.tsx b/static/app/components/events/eventAttachments.tsx
@@ -1,11 +1,11 @@
-import {Fragment, useRef, useState} from 'react';
+import {Fragment, useState} from 'react';
 import styled from '@emotion/styled';
 
 import {
   useDeleteEventAttachmentOptimistic,
   useFetchEventAttachments,
 } from 'sentry/actionCreators/events';
-import {Button} from 'sentry/components/button';
+import {LinkButton} from 'sentry/components/button';
 import EventAttachmentActions from 'sentry/components/events/eventAttachmentActions';
 import FileSize from 'sentry/components/fileSize';
 import LoadingError from 'sentry/components/loadingError';
@@ -14,11 +14,13 @@ import {t} from 'sentry/locale';
 import type {Event} from 'sentry/types/event';
 import type {Group, IssueAttachment} from 'sentry/types/group';
 import type {Project} from 'sentry/types/project';
+import {useLocation} from 'sentry/utils/useLocation';
 import useOrganization from 'sentry/utils/useOrganization';
 import {InlineEventAttachment} from 'sentry/views/issueDetails/groupEventAttachments/inlineEventAttachment';
-import {useGroupEventAttachmentsDrawer} from 'sentry/views/issueDetails/groupEventAttachments/useGroupEventAttachmentsDrawer';
 import {SectionKey} from 'sentry/views/issueDetails/streamline/context';
 import {InterimSection} from 'sentry/views/issueDetails/streamline/interimSection';
+import {Tab, TabPaths} from 'sentry/views/issueDetails/types';
+import {useGroupDetailsRoute} from 'sentry/views/issueDetails/useGroupDetailsRoute';
 import {useHasStreamlinedUI} from 'sentry/views/issueDetails/utils';
 
 import EventAttachmentsCrashReportsNotice from './eventAttachmentsCrashReportsNotice';
@@ -41,24 +43,20 @@ const attachmentPreviewIsOpen = (
   return attachmentPreviews[attachment.id] === true;
 };
 
-function ViewAllGroupAttachmentsButton({
-  group,
-  project,
-}: {
-  group: Group;
-  project: Project;
-}) {
-  const openButtonRef = useRef<HTMLButtonElement>(null);
-  const {openAttachmentDrawer} = useGroupEventAttachmentsDrawer({
-    project,
-    group,
-    openButtonRef,
-  });
+function ViewAllGroupAttachmentsButton() {
+  const {baseUrl} = useGroupDetailsRoute();
+  const location = useLocation();
 
   return (
-    <Button ref={openButtonRef} onClick={openAttachmentDrawer} size="xs">
+    <LinkButton
+      size="xs"
+      to={{
+        pathname: `${baseUrl}${TabPaths[Tab.ATTACHMENTS]}`,
+        query: location.query,
+      }}
+    >
       {t('View All Attachments')}
-    </Button>
+    </LinkButton>
   );
 }
 
@@ -113,9 +111,7 @@ function EventAttachmentsContent({event, project, group}: EventAttachmentsProps)
       type={SectionKey.ATTACHMENTS}
       title={title}
       actions={
-        hasStreamlinedUI && project && group ? (
-          <ViewAllGroupAttachmentsButton group={group} project={project} />
-        ) : null
+        hasStreamlinedUI && project && group ? <ViewAllGroupAttachmentsButton /> : null
       }
     >
       {crashFileStripped && (

diff --git a/static/app/components/events/highlights/highlightsDataSection.spec.tsx b/static/app/components/events/highlights/highlightsDataSection.spec.tsx
@@ -1,5 +1,4 @@
 import {EventFixture} from 'sentry-fixture/event';
-import {GroupFixture} from 'sentry-fixture/group';
 import {OrganizationFixture} from 'sentry-fixture/organization';
 import {ProjectFixture} from 'sentry-fixture/project';
 
@@ -18,7 +17,6 @@ import * as analytics from 'sentry/utils/analytics';
 describe('HighlightsDataSection', function () {
   const organization = OrganizationFixture();
   const project = ProjectFixture();
-  const group = GroupFixture();
   const event = EventFixture({
     contexts: TEST_EVENT_CONTEXTS,
     tags: TEST_EVENT_TAGS,
@@ -57,7 +55,6 @@ describe('HighlightsDataSection', function () {
         event={event}
         project={project}
         viewAllRef={{current: null}}
-        groupId={group.id}
       />,
       {organization}
     );
@@ -92,7 +89,7 @@ describe('HighlightsDataSection', function () {
       body: {},
     });
 
-    render(<HighlightsDataSection event={event} project={project} groupId={group.id} />, {
+    render(<HighlightsDataSection event={event} project={project} />, {
       organization,
     });
     expect(screen.getByText('Event Highlights')).toBeInTheDocument();

diff --git a/static/app/views/issueDetails/streamline/attachmentsBadge.spec.tsx b/static/app/views/issueDetails/streamline/attachmentsBadge.spec.tsx
@@ -1,7 +1,6 @@
 import {EventAttachmentFixture} from 'sentry-fixture/eventAttachment';
 import {GroupFixture} from 'sentry-fixture/group';
 import {OrganizationFixture} from 'sentry-fixture/organization';
-import {ProjectFixture} from 'sentry-fixture/project';
 
 import {act, render, screen} from 'sentry-test/reactTestingLibrary';
 
@@ -10,7 +9,6 @@ import {AttachmentsBadge} from './attachmentsBadge';
 describe('AttachmentsBadge', () => {
   const organization = OrganizationFixture();
   const group = GroupFixture();
-  const project = ProjectFixture();
 
   beforeEach(() => {
     MockApiClient.clearMockResponses();
@@ -22,7 +20,7 @@ describe('AttachmentsBadge', () => {
       body: [],
     });
 
-    const {container} = render(<AttachmentsBadge group={group} project={project} />);
+    const {container} = render(<AttachmentsBadge group={group} />);
 
     // Wait for requests to finish
     await act(tick);
@@ -35,7 +33,7 @@ describe('AttachmentsBadge', () => {
       body: [EventAttachmentFixture()],
     });
 
-    render(<AttachmentsBadge group={group} project={project} />);
+    render(<AttachmentsBadge group={group} />);
 
     expect(await screen.findByRole('button', {name: '1 Attachment'})).toBeInTheDocument();
   });
@@ -50,7 +48,7 @@ describe('AttachmentsBadge', () => {
       },
     });
 
-    render(<AttachmentsBadge group={group} project={project} />);
+    render(<AttachmentsBadge group={group} />);
 
     expect(
       await screen.findByRole('button', {name: '50+ Attachments'})