Merge pull request stakwork#16 from MirzaHanan/bounty-page-go-back-home

Fix(Bounty-Page): Enhanced Navigation for Direct Access to Bounty Pages

src/pages/tickets/TicketModalPage.tsx

@@ -15,6 +15,7 @@ const focusedDesktopModalStyles = widgetConfigs.wanted.modalStyle;
 
 type Props = {
   setConnectPerson: (p: any) => void;
+  visible?: boolean;
 };
 
 export const TicketModalPage = observer(({ setConnectPerson }: Props) => {
@@ -28,7 +29,7 @@ export const TicketModalPage = observer(({ setConnectPerson }: Props) => {
   const [activeListIndex, setActiveListIndex] = useState<number>(0);
   const [publicFocusIndex, setPublicFocusIndex] = useState(0);
   const [removeNextAndPrev, setRemoveNextAndPrev] = useState(false);
-  const { bountyId } = useParams<{ uuid: string; bountyId: string }>();
+  const { uuid, bountyId } = useParams<{ uuid: string; bountyId: string }>();
   const [activeBounty, setActiveBounty] = useState<PersonBounty[]>([]);
   const [visible, setVisible] = useState(false);
   const [isDeleted, setisDeleted] = useState(false);
@@ -73,10 +74,21 @@ export const TicketModalPage = observer(({ setConnectPerson }: Props) => {
     getBounty();
   }, [getBounty, removeNextAndPrev]);
 
-  const goBack = async () => {
+  const isDirectAccess = useCallback(
+    () => !document.referrer && location.pathname.includes('/bounty/'),
+    [location.pathname]
+  );
+
+  const goBack = () => {
     setVisible(false);
     setisDeleted(false);
-    history.goBack();
+
+    if (isDirectAccess()) {
+      const homePageUrl = uuid ? `/org/bounties/${uuid}` : '/bounties';
+      history.push(homePageUrl);
+    } else {
+      history.goBack();
+    }
   };
 
   const directionHandler = (person: any, body: any) => {

src/pages/tickets/__tests__/TicketModalPage.spec.tsx

@@ -0,0 +1,58 @@
+import React from 'react';
+import { render, fireEvent, screen, waitFor } from '@testing-library/react';
+import { useIsMobile } from 'hooks';
+import { useStores } from 'store';
+import { TicketModalPage } from '../TicketModalPage.tsx';
+
+jest.mock('hooks', () => ({
+  useIsMobile: jest.fn()
+}));
+
+jest.mock('store', () => ({
+  useStores: jest.fn()
+}));
+
+const mockPush = jest.fn();
+const mockGoBack = jest.fn();
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useHistory: () => ({
+    push: mockPush,
+    goBack: mockGoBack
+  }),
+  useLocation: () => ({
+    pathname: '/bounty/1239',
+    search: '',
+    state: {}
+  }),
+  useParams: () => ({
+    uuid: 'ck95pe04nncjnaefo08g',
+    bountyId: '1239'
+  })
+}));
+
+describe('TicketModalPage Component', () => {
+  it('should redirect to the appropriate page on close based on the route', async () => {
+    (useIsMobile as jest.Mock).mockReturnValue(false);
+
+    (useStores as jest.Mock).mockReturnValue({
+      main: {
+        getBountyById: jest.fn(),
+        getBountyIndexById: jest.fn()
+      }
+    });
+
+    render(<TicketModalPage setConnectPerson={jest.fn()} visible={true} />);
+
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    await waitFor(() => {});
+
+    const closeButton = screen.queryByTestId('close-btn');
+    if (closeButton) {
+      fireEvent.click(closeButton);
+
+      expect(mockPush).toHaveBeenCalledWith('/bounties');
+    }
+  });
+});