Skip to content

fix: preserve volunteer param in opportunity table view (#739) #798

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

Open
yi171 wants to merge 1 commit into
base: develop
Choose a base branch
from
+8 −2
Open

fix: preserve volunteer param in opportunity table view (#739) #798

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions src/components/Dashboard/Opportunities/OpportunityListController.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export function OpportunityListController({
currentPage={currentPage}
setCurrentPage={setCurrentPage}
districtsList={apiFilterOptions?.district ?? undefined}
volunteerId={volunteerId}
/>
);
}
Expand Down
3 changes: 3 additions & 0 deletions src/components/Dashboard/Opportunities/OpportunityTableList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ interface TableListProps {
currentPage: number;
setCurrentPage: (page: number) => void;
districtsList?: OptionItem[];
volunteerId?: string;
}

export function OpportunityTableList({
Expand All @@ -25,6 +26,7 @@ export function OpportunityTableList({
currentPage,
setCurrentPage,
districtsList,
volunteerId,
}: TableListProps) {
const { t } = useTranslation();
const { isAuthorized } = useAuth();
Expand All @@ -42,6 +44,7 @@ export function OpportunityTableList({
opportunity={opportunity}
isLast={isLast}
districtsList={districtsList}
volunteerId={volunteerId}
/>
) : (
<OpportunityReadOnlyTableRow
Expand Down
6 changes: 4 additions & 2 deletions src/components/Dashboard/Opportunities/OpportunityTableRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ interface TableRowProps {
opportunity: ApiVolunteerOpportunityGetList;
isLast: boolean;
districtsList?: OptionItem[];
volunteerId?: string;
}

export function OpportunityTableRow({ opportunity, isLast, districtsList }: TableRowProps) {
export function OpportunityTableRow({ opportunity, isLast, districtsList, volunteerId }: TableRowProps) {
const { t, i18n } = useTranslation();

const ext = opportunity as ExtendedOpportunity;
Expand All @@ -52,7 +53,8 @@ export function OpportunityTableRow({ opportunity, isLast, districtsList }: Tabl
const otherVolunteersCount = numberOfVolunteers && numberOfVolunteers > 1 ? numberOfVolunteers - 1 : 0;
const matchedNames = firstName && otherVolunteersCount ? `${firstName} +${otherVolunteersCount}` : firstName;

const profileUrl = id ? `/${i18n.language}/dashboard/opportunities/${id}` : "";
const params = volunteerId ? `?volunteer=${volunteerId}` : "";
const profileUrl = id ? `/${i18n.language}/dashboard/opportunities/${id}${params}` : "";

return (
<ClickableRow as={Link} href={profileUrl} $isLast={isLast} data-testid={`opportunity-row-${id}`}>
Expand Down
Loading