Skip to content

164 dev camila/make my grants match to the current users email #177

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

Merged
merged 5 commits into from
Nov 4, 2025
Merged

164 dev camila/make my grants match to the current users email #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0d6d276
route added to main page & beginning for my grants page
camila-carrillo Oct 13, 2025
12ee2d6
deleted mygrants page, modified mygrants route, initial filter logic
camila-carrillo Oct 16, 2025
8d29c92
deleted comments
camila-carrillo Oct 17, 2025
c5df497
Merge branch 'main' into 164-dev---camila/make-my-grants-match-to-the…
prooflesben Nov 4, 2025
4199705
Fixed merge issue
prooflesben Nov 4, 2025
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
4 changes: 3 additions & 1 deletion frontend/src/main-page/MainPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import GrantPage from "./grants/GrantPage";
import Header from "./header/Header";
import Users from "./users/Users";


function MainPage() {


Expand All @@ -12,7 +13,8 @@ function MainPage() {
<Header />
<Routes>
<Route path="/dashboard" element={<Dashboard />} />
<Route path="/all-grants" element={<GrantPage />} />
<Route path="/all-grants" element={<GrantPage showOnlyMyGrants={false} />} />
<Route path="/my-grants" element={<GrantPage showOnlyMyGrants={true} />} />
<Route path="/users" element={<Users />} />
{/* fallback route */}
<Route path="*" element={<GrantPage />} />
Expand Down
16 changes: 15 additions & 1 deletion frontend/src/main-page/grants/GrantPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,24 @@ import NewGrantModal from "./new-grant/NewGrantModal.tsx";
import { useEffect, useState } from "react";
import { Grant } from "../../../../middle-layer/types/Grant.ts";
import FilterBar from "./filter-bar/FilterBar.tsx";
import { useAuthContext } from "../../context/auth/authContext";
import { updateEndDateFilter, updateFilter, updateStartDateFilter, updateYearFilter } from "../../external/bcanSatchel/actions.ts";

function GrantPage() {

interface GrantPageProps {
showOnlyMyGrants?: boolean; //if true, filters grants by user email
}


function GrantPage({ showOnlyMyGrants = false }: GrantPageProps) {
const [showNewGrantModal, setShowNewGrantModal] = useState(false);
const [selectedGrant, setSelectedGrant] = useState<Grant | null>(null);

const { user } = useAuthContext(); //gets current logged in user

const currentUserEmail = user?.email || ""; //safe fallback

console.log("Current logged-in user:", user);
// reset filters on initial render
useEffect(() => {
updateYearFilter(null);
Expand Down Expand Up @@ -40,6 +52,8 @@ function GrantPage() {
selectedGrant ? selectedGrant.grantId : undefined
}
onClearSelectedGrant={() => setSelectedGrant(null)}
currentUserEmail={currentUserEmail}
showOnlyMyGrants={showOnlyMyGrants}
/>
</div>
</div>
Expand Down
Empty file added frontend/src/main-page/grants/grant-list/MyGrantList.tsx
View file
Open in desktop
Empty file.
171 changes: 87 additions & 84 deletions frontend/src/main-page/grants/grant-list/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,106 +7,109 @@ import { ButtonGroup, IconButton, Pagination } from "@chakra-ui/react";
import { HiChevronLeft, HiChevronRight } from "react-icons/hi";
import { ProcessGrantData } from "../filter-bar/processGrantData.ts";
import NewGrantModal from "../new-grant/NewGrantModal.tsx";
import { Grant } from "../../../../../middle-layer/types/Grant.ts";

const ITEMS_PER_PAGE = 6;

interface GrantListProps {
selectedGrantId?: number;
onClearSelectedGrant?: () => void;
selectedGrantId?: number;
onClearSelectedGrant?: () => void;
showOnlyMyGrants?: boolean;
currentUserEmail?: string;
}

const GrantList: React.FC<GrantListProps> = observer(
({ selectedGrantId, onClearSelectedGrant }) => {
const GrantList: React.FC<GrantListProps> = observer(({ selectedGrantId, onClearSelectedGrant, showOnlyMyGrants = false, currentUserEmail }) => {
const { grants, onSort } = ProcessGrantData();
const [currentPage, setPage] = useState(1);
const [showNewGrantModal, setShowNewGrantModal] = useState(false);

useEffect(() => {
if (selectedGrantId !== undefined && grants.length > 0) {
const index = grants.findIndex(
(grant) => grant.grantId === Number(selectedGrantId)
);
if (index !== -1) {
const targetPage = Math.floor(index / ITEMS_PER_PAGE) + 1;
if (targetPage !== currentPage) {
setPage(targetPage);
}
}
}
}, [selectedGrantId, grants, currentPage]);
const displayedGrants = showOnlyMyGrants ? grants.filter(
(grant: Grant) => grant.bcan_poc?.POC_email?.toLowerCase() === currentUserEmail?.toLowerCase()
)
: grants;

const count = grants.length;
useEffect(() => {
if (selectedGrantId !== undefined && grants.length > 0) {
const index = grants.findIndex(grant => grant.grantId === Number(selectedGrantId));
if (index !== -1) {
const targetPage = Math.floor(index / ITEMS_PER_PAGE) + 1;
if (targetPage !== currentPage) {
setPage(targetPage);
}
}
}
}, [selectedGrantId, grants, currentPage]);

const count = displayedGrants.length;
const startRange = (currentPage - 1) * ITEMS_PER_PAGE;
const endRange = startRange + ITEMS_PER_PAGE;
const visibleItems = grants.slice(startRange, endRange);
const visibleItems = displayedGrants.slice(startRange, endRange);

return (
<div className="paginated-grant-list">
<div className="bg-light-orange rounded-[1.2rem] pt-2">
<GrantLabels onSort={onSort} />
<div className="grant-list p-4">
{visibleItems.map((grant) => (
<GrantItem
key={grant.grantId}
grant={grant}
defaultExpanded={grant.grantId === Number(selectedGrantId)}
/>
))}
</div>
<div className="paginated-grant-list">
<div className="bg-light-orange rounded-[1.2rem] pt-2">
<GrantLabels onSort={onSort} />
<div className="grant-list p-4">
{visibleItems.map((grant) => (
<GrantItem key={grant.grantId}
grant={grant}
defaultExpanded={grant.grantId === Number(selectedGrantId)} />
))}
{visibleItems.length === 0 && (
<p className="text-center text-gray-500 py-6">
{showOnlyMyGrants
? "You currently have no grants assigned as BCAN POC."
: "No grants found>"}
</p>
)}
</div>
</div>
<Pagination.Root
className="pt-4"
count={count}
pageSize={ITEMS_PER_PAGE}
page={currentPage}
onClick={ () => {
if (onClearSelectedGrant) { onClearSelectedGrant();}}}
onPageChange={(e) => {
setPage(e.page);}}
>
<ButtonGroup variant="ghost" size="md">
<Pagination.PrevTrigger asChild>
<IconButton>
<HiChevronLeft />
</IconButton>
</Pagination.PrevTrigger>
<Pagination.Context>
{({ pages }) =>
pages.map((page, index) =>
page.type === "page" ? (
<IconButton
key={index}
className={currentPage === page.value ? "text-dark-blue underline" : "ghost"}
onClick={() => setPage(page.value)}
aria-label={`Go to page ${page.value}`}
>
{page.value}
</IconButton>
) : (
"..."
)
)
}
</Pagination.Context>
<Pagination.NextTrigger asChild>
<IconButton>
<HiChevronRight />
</IconButton>
</Pagination.NextTrigger>
</ButtonGroup>
</Pagination.Root>
{showNewGrantModal && (
<NewGrantModal onClose={() => setShowNewGrantModal(false)} />
)}
</div>
<Pagination.Root
className="pt-4"
count={count}
pageSize={ITEMS_PER_PAGE}
page={currentPage}
onClick={() => {
if (onClearSelectedGrant) {
onClearSelectedGrant();
}
}}
onPageChange={(e) => {
setPage(e.page);
}}
>
<ButtonGroup variant="ghost" size="md">
<Pagination.PrevTrigger asChild>
<IconButton>
<HiChevronLeft />
</IconButton>
</Pagination.PrevTrigger>
<Pagination.Context>
{({ pages }) =>
pages.map((page, index) =>
page.type === "page" ? (
<IconButton
key={index}
className={
currentPage === page.value
? "text-dark-blue underline"
: "ghost"
}
onClick={() => setPage(page.value)}
aria-label={`Go to page ${page.value}`}
>
{page.value}
</IconButton>
) : (
"..."
)
)
}
</Pagination.Context>
<Pagination.NextTrigger asChild>
<IconButton>
<HiChevronRight />
</IconButton>
</Pagination.NextTrigger>
</ButtonGroup>
</Pagination.Root>
{showNewGrantModal && (
<NewGrantModal onClose={() => setShowNewGrantModal(false)} />
)}
</div>

);
}
);
Expand Down