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

Jump to bottom

Make old and new bounty URL compaitible #800

Merged
merged 1 commit into from
Oct 7, 2023
Merged

Make old and new bounty URL compaitible #800

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 45 additions & 9 deletions frontend/app/src/pages/tickets/TicketModalPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,26 @@ import { useIsMobile } from 'hooks';
import { observer } from 'mobx-react-lite';
import FocusedView from 'people/main/FocusView';
import { widgetConfigs } from 'people/utils/Constants';
import React, { useEffect, useState } from 'react';
import { useHistory, useParams } from 'react-router-dom';
import React, { useEffect, useState, useMemo } from 'react';
import { useHistory, useLocation, useParams } from 'react-router-dom';
import { useStores } from 'store';
import { PersonBounty } from 'store/main';

const color = colors['light'];
const focusedDesktopModalStyles = widgetConfigs.wanted.modalStyle;

const findPerson = (search: any) => (item: any) => {
const { person, body } = item;
return search.owner_id === person.owner_pubkey && search.created === `${body.created}`;
};

type Props = {
setConnectPerson: (p: any) => void;
};

export const TicketModalPage = observer(({ setConnectPerson }: Props) => {
const location = useLocation();

const { main, modals, ui } = useStores();

const history = useHistory();
Expand All @@ -27,17 +34,25 @@ export const TicketModalPage = observer(({ setConnectPerson }: Props) => {

const isMobile = useIsMobile();

const search = useMemo(() => {
const s = new URLSearchParams(location.search);
return {
owner_id: s.get('owner_id'),
created: s.get('created')
};
}, [location.search]);

useEffect(() => {
const activeIndex = main.peopleBounties.findIndex(
const activeIndex = bountyId ? main.peopleBounties.findIndex(
(bounty: PersonBounty) => bounty.body.id === Number(bountyId)
);
) : (main.peopleBounties ?? []).findIndex(findPerson(search));
const connectPerson = (main.peopleBounties ?? [])[activeIndex];

setPublicFocusIndex(activeIndex);
setActiveListIndex(activeIndex);

setConnectPersonBody(connectPerson?.person);
}, [main.peopleBounties, bountyId]);
}, [main.peopleBounties, bountyId, search]);

const goBack = () => {
history.push('/bounties');
Expand All @@ -48,21 +63,41 @@ export const TicketModalPage = observer(({ setConnectPerson }: Props) => {

const { person, body } = main.peopleBounties[activeListIndex - 1];
if (person && body) {
history.replace(`/bounty/${body.id}`);
if (bountyId) history.replace(`/bounty/${body.id}`);
else {
history.replace({
pathname: history?.location?.pathname,
search: `?owner_id=${person?.owner_pubkey}&created=${body?.created}`,
state: {
owner_id: person?.owner_pubkey,
created: body?.created
}
});
}
}
};
const nextArrHandler = () => {
if (activeListIndex + 1 > main.peopleBounties?.length) return;

const { person, body } = main.peopleBounties[activeListIndex + 1];
if (person && body) {
history.replace(`/bounty/${body.id}`);
if (bountyId) history.replace(`/bounty/${body.id}`);
else {
history.replace({
pathname: history?.location?.pathname,
search: `?owner_id=${person?.owner_pubkey}&created=${body?.created}`,
state: {
owner_id: person?.owner_pubkey,
created: body?.created
}
});
}
}
};

if (isMobile) {
return (
<Modal visible={bountyId} fill={true}>
<Modal visible={activeListIndex !== -1} fill={true}>
<FocusedView
person={connectPersonBody}
personBody={connectPersonBody}
Expand All @@ -77,7 +112,7 @@ export const TicketModalPage = observer(({ setConnectPerson }: Props) => {

return (
<Modal
visible={bountyId && activeListIndex !== -1}
visible={activeListIndex !== -1}
envStyle={{
background: color.pureWhite,
...focusedDesktopModalStyles,
Expand Down Expand Up @@ -117,3 +152,4 @@ export const TicketModalPage = observer(({ setConnectPerson }: Props) => {
</Modal>
);
});

Loading