Skip to content

Grant gets shown after it was created #399

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
lyannne wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Grant gets shown after it was created #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3412500
creating grant puts it in focus
lyannne Apr 9, 2026
18ef0f1
fixed bug with status filter still showing an applied filter after cl…
lyannne Apr 9, 2026
4c337dc
Merge remote-tracking branch 'origin/main' into grant-gets-shown-afte…
lyannne Apr 9, 2026
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
65 changes: 61 additions & 4 deletions frontend/src/main-page/grants/GrantPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,22 @@ import FilterBar from "./filter-bar/FilterBar.tsx";
import GrantItem from "./grant-view/GrantView.tsx";
import { observer } from "mobx-react-lite";
import { ProcessGrantData } from "./filter-bar/processGrantData.ts";
import {
amountRangeFilter,
dateRangeFilter,
eligibleFilter,
filterGrants,
searchFilter,
statusFilter,
userEmailFilter,
yearFilterer,
} from "./filter-bar/grantFilters.ts";
import GrantCard from "./grant-view/components/GrantCard.tsx";
import Button from "../../components/Button.tsx";
import EditGrant from "./edit-grant/EditGrant.tsx";
import { faPlus } from "@fortawesome/free-solid-svg-icons";
import { clearAllFilters } from "../../external/bcanSatchel/actions.ts";
import { getAppStore } from "../../external/bcanSatchel/store.ts";

function GrantPage() {
const [showEditGrant, setShowEditGrant] = useState(false);
Expand All @@ -21,11 +33,55 @@ function GrantPage() {
grants[0] ??
null;

// When the first grant in the list changes (sort/filter/initial load), show it
const firstGrantId = grants[0]?.grantId ?? null;
const handleGrantCreated = (grantId: number) => {
setCurId(grantId);

const {
allGrants,
filterStatus,
startDateFilter,
endDateFilter,
yearFilter,
searchQuery,
emailFilter,
eligibleOnly,
amountMinFilter,
amountMaxFilter,
user,
} = getAppStore();

const createdGrant = allGrants.find((grant) => grant.grantId === grantId);

if (createdGrant) {
const grantIsVisible =
filterGrants([createdGrant], [
statusFilter(filterStatus),
eligibleFilter(eligibleOnly),
dateRangeFilter(startDateFilter, endDateFilter),
amountRangeFilter(amountMinFilter, amountMaxFilter),
yearFilterer(yearFilter),
searchFilter(searchQuery),
userEmailFilter(emailFilter, user),
]).length > 0;

Comment on lines +39 to +66
Copy link

Copilot AI Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

handleGrantCreated re-implements the full grant filtering pipeline inline (status/eligible/date/amount/year/search/email). This duplicates the predicate list used in ProcessGrantData, so adding/changing filters later could make the “is created grant visible?” check drift from what the page actually renders. Consider extracting a shared helper that builds the predicate list from the store (and reuse it in both places), so visibility checks stay consistent over time.

Copilot uses AI. Check for mistakes.
if (!grantIsVisible) {
clearAllFilters();
}
}
};

// Preserve current selection when still visible; otherwise show the first visible grant.
useEffect(() => {
setCurId(grants.length > 0 ? grants[0].grantId : null);
}, [firstGrantId]);
if (grants.length === 0) {
setCurId(null);
return;
}

const currentSelectionStillVisible = grants.some((grant) => grant.grantId === curId);
if (!currentSelectionStillVisible) {
setCurId(grants[0].grantId);
}
}, [curId, grants]);

return (
<div className="grant-page w-full items-end flex flex-col h-[86vh]">
Expand Down Expand Up @@ -64,6 +120,7 @@ function GrantPage() {
{showEditGrant && (
<EditGrant
grantToEdit={null}
onGrantCreated={handleGrantCreated}
onClose={async () => {
setShowEditGrant(false);
}}
Expand Down
6 changes: 5 additions & 1 deletion frontend/src/main-page/grants/edit-grant/EditGrant.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ export interface GrantFormState {
const EditGrant: React.FC<{
grantToEdit: Grant | null;
onClose: () => void;
}> = observer(({ grantToEdit, onClose }) => {
onGrantCreated?: (grantId: number) => void;
}> = observer(({ grantToEdit, onClose, onGrantCreated }) => {
// State to track if form was submitted successfully
const [saving, setSaving] = useState(false);
const [showDeleteModal, setShowDeleteModal] = useState(false);
Expand Down Expand Up @@ -144,6 +145,9 @@ const EditGrant: React.FC<{
: await createNewGrant(grantData);

if (result.success) {
if (!grantToEdit && result.grantId != null) {
onGrantCreated?.(result.grantId);
}
setSaving(false);
onClose();
} else {
Expand Down
15 changes: 12 additions & 3 deletions frontend/src/main-page/grants/edit-grant/processGrantDataEditSave.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@ import { api } from "../../../api.ts";
import { GrantFormState } from "./EditGrant.tsx";
import { fetchGrants } from "../filter-bar/processGrantData.ts";

export type GrantMutationResult =
| { success: true; grantId?: number }
| { success: false; error: string };

// save a new grant
export const createNewGrant = async (newGrant: Grant) => {
export const createNewGrant = async (
newGrant: Grant
): Promise<GrantMutationResult> => {
try {
const response = await api("/grant/new-grant", {
method: "POST",
Expand All @@ -14,8 +20,9 @@ export const createNewGrant = async (newGrant: Grant) => {
});

if (response.ok) {
const createdGrantId = (await response.json()) as number;
await fetchGrants();
return { success: true };
return { success: true, grantId: createdGrantId };
} else {
const errorData = await response.json();
throw new Error(errorData.message || "Failed to create grant");
Expand All @@ -34,7 +41,9 @@ export const createNewGrant = async (newGrant: Grant) => {
}
};

export const saveGrantEdits = async (updatedGrant: Grant) => {
export const saveGrantEdits = async (
updatedGrant: Grant
): Promise<GrantMutationResult> => {
try {
const response = await api("/grant/save", {
method: "PUT",
Expand Down
9 changes: 4 additions & 5 deletions frontend/src/main-page/grants/filter-bar/FilterBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const FilterBar: React.FC = observer(() => {
emailFilter,
eligibleOnly,
sort,
filterStatus,
startDateFilter,
endDateFilter,
amountMinFilter,
Expand All @@ -34,7 +35,6 @@ const FilterBar: React.FC = observer(() => {
const [showDueDateCard, setShowDueDateCard] = useState(false);
const [showAmountCard, setShowAmountCard] = useState(false);
const [showStatusDropdown, setShowStatusDropdown] = useState(false);
const [selectedStatus, setSelectedStatus] = useState<Status | null>(null);
const dueDateDropdownRef = useRef<HTMLDivElement | null>(null);
const amountDropdownRef = useRef<HTMLDivElement | null>(null);
const statusDropdownRef = useRef<HTMLDivElement | null>(null);
Expand Down Expand Up @@ -82,8 +82,7 @@ const FilterBar: React.FC = observer(() => {
};

const handleStatusSelect = (status: Status) => {
const newSelected = selectedStatus === status ? null : status;
setSelectedStatus(newSelected);
const newSelected = filterStatus === status ? null : status;
updateFilter(newSelected);
};

Expand Down Expand Up @@ -279,11 +278,11 @@ const FilterBar: React.FC = observer(() => {
logo={showStatusDropdown ? faChevronUp : faChevronDown}
logoPosition="right"
className={`bg-white text-sm lg:text-base whitespace-nowrap ${
showStatusDropdown || selectedStatus ? activeButtonClass : inactiveButtonClass
showStatusDropdown || filterStatus ? activeButtonClass : inactiveButtonClass
}`}
/>
{showStatusDropdown && (
<StatusDropdown selected={selectedStatus} onSelect={handleStatusSelect} />
<StatusDropdown selected={filterStatus} onSelect={handleStatusSelect} />
)}
</div>
</div>
Expand Down
Loading