Skip to content

Admin Bugbash Fixes #206

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

Admin Bugbash Fixes #206

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
917cd98
focus trap errors for view order details
jiang-h-y Jul 27, 2026
b23d604
focus trap errors for view donation details
jiang-h-y Jul 27, 2026
88727b5
re-fetch users after adding a new user
jiang-h-y Jul 27, 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
240 changes: 123 additions & 117 deletions apps/frontend/src/components/forms/donationDetailsModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import EditableDonationItemsTable, {
} from './editableDonationItemsTable';

interface DonationDetailsModalProps {
donation: Donation;
donation: Donation | null;
isOpen: boolean;
onClose: () => void;
onSuccess: () => void;
Expand All @@ -48,13 +48,14 @@ const DonationDetailsModal: React.FC<DonationDetailsModalProps> = ({

const [isEditing, setIsEditing] = useState(false);

const donationId = donation.donationId;
const donationId = donation?.donationId;

@Yurika-Kan Yurika-Kan Jul 30, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

nit: when we do optional chaining, it results in Donation | undefined, which becomes inconsistent with donation's form (Donation | null). can we clean it to
const donationId = donation ? donation.donationId : null;


const handleCancel = () => {
setIsEditing(false);
};

const loadItems = useCallback(async () => {
if (donationId == null) return;
try {
const itemsData = await ApiClient.getDonationItemsByDonationId(
donationId,
Expand All @@ -66,6 +67,7 @@ const DonationDetailsModal: React.FC<DonationDetailsModalProps> = ({
}, [donationId, setAlertMessage]);

const handleUpdate = async (rows: DonationRow[]) => {
if (donationId == null) return;
const existingIds = new Set(items.map((i) => i.itemId));
const body: ReplaceDonationItemDto[] = rows.map((r) => ({
...(existingIds.has(r.id) ? { itemId: r.id } : {}),
Expand Down Expand Up @@ -122,128 +124,132 @@ const DonationDetailsModal: React.FC<DonationDetailsModalProps> = ({
)}
<Dialog.Backdrop bg="blackAlpha.300" />

<Dialog.Positioner>
<Dialog.Content
maxW={isEditing ? '75vw' : 'lg'}
maxH={isEditing ? '90vh' : undefined}
>
<Dialog.CloseTrigger asChild>
<CloseButton />
</Dialog.CloseTrigger>

<Dialog.Header>
<VStack align="stretch" gap={0}>
<HStack mb={2}>
<Dialog.Title fontSize="lg" fontWeight="600">
Donation #{donationId} Stock
</Dialog.Title>
{donation.status === DonationStatus.AVAILABLE && (
<>
<EditButton onClick={() => setIsEditing(true)}></EditButton>
<DeleteButton onClick={onDelete}></DeleteButton>
</>
)}
</HStack>
<Text fontSize="sm">
{donation.foodManufacturer?.foodManufacturerName}
</Text>
<Text fontSize="sm">{formatDate(donation.dateDonated)}</Text>
</VStack>
</Dialog.Header>

<Dialog.Body>
{isEditing ? (
<EditableDonationItemsTable
initialRows={items.map((item) => ({
id: item.itemId,
foodItem: item.itemName,
foodType: item.foodType,
numItems: String(item.quantity),
ozPerItem: String(item.ozPerItem),
valuePerItem: String(item.estimatedValue),
foodRescue: item.foodRescue,
}))}
onCancel={handleCancel}
onSubmit={handleUpdate}
submitButtonLabel="Update Donation"
></EditableDonationItemsTable>
) : (
<VStack align="stretch" gap={4} my={2}>
{Object.entries(groupedItems).map(([foodType, typeItems]) => (
<Box key={foodType}>
<Text
fontSize="sm"
fontWeight="600"
color="neutral.800"
mb={2}
>
{foodType}
</Text>

<VStack align="stretch" gap={2}>
{typeItems.map((item, _) => (
<Box
key={item.itemId}
display="flex"
p={0}
border="1px solid"
borderColor="neutral.100"
borderRadius="md"
overflow="hidden"
color="neutral.800"
fontSize="sm"
>
<Box flex={1} p={3} bg="white">
<Text>{item.itemName}</Text>
</Box>
{donation !== null && (
<Dialog.Positioner>
<Dialog.Content
maxW={isEditing ? '75vw' : 'lg'}
maxH={isEditing ? '90vh' : undefined}
>
<Dialog.CloseTrigger asChild>
<CloseButton />
</Dialog.CloseTrigger>

<Dialog.Header>
<VStack align="stretch" gap={0}>
<HStack mb={2}>
<Dialog.Title fontSize="lg" fontWeight="600">
Donation #{donationId} Stock
</Dialog.Title>
{donation.status === DonationStatus.AVAILABLE && (
<>
<EditButton
onClick={() => setIsEditing(true)}
></EditButton>
<DeleteButton onClick={onDelete}></DeleteButton>
</>
)}
</HStack>
<Text fontSize="sm">
{donation.foodManufacturer?.foodManufacturerName}
</Text>
<Text fontSize="sm">{formatDate(donation.dateDonated)}</Text>
</VStack>
</Dialog.Header>

<Dialog.Body>
{isEditing ? (
<EditableDonationItemsTable
initialRows={items.map((item) => ({
id: item.itemId,
foodItem: item.itemName,
foodType: item.foodType,
numItems: String(item.quantity),
ozPerItem: String(item.ozPerItem),
valuePerItem: String(item.estimatedValue),
foodRescue: item.foodRescue,
}))}
onCancel={handleCancel}
onSubmit={handleUpdate}
submitButtonLabel="Update Donation"
></EditableDonationItemsTable>
) : (
<VStack align="stretch" gap={4} my={2}>
{Object.entries(groupedItems).map(([foodType, typeItems]) => (
<Box key={foodType}>
<Text
fontSize="sm"
fontWeight="600"
color="neutral.800"
mb={2}
>
{foodType}
</Text>

<VStack align="stretch" gap={2}>
{typeItems.map((item, _) => (
<Box
borderLeft="1px solid"
borderColor="neutral.100"
p={3}
width="35%"
key={item.itemId}
display="flex"
alignItems="center"
justifyContent="center"
bg="white"
p={0}
border="1px solid"
borderColor="neutral.100"
borderRadius="md"
overflow="hidden"
color="neutral.800"
fontSize="sm"
>
<Text>
{item.quantity - item.reservedQuantity} of{' '}
{item.quantity} Remaining
</Text>
<Box flex={1} p={3} bg="white">
<Text>{item.itemName}</Text>
</Box>

<Box
borderLeft="1px solid"
borderColor="neutral.100"
p={3}
width="35%"
display="flex"
alignItems="center"
justifyContent="center"
bg="white"
>
<Text>
{item.quantity - item.reservedQuantity} of{' '}
{item.quantity} Remaining
</Text>
</Box>
</Box>
</Box>
))}
</VStack>
</Box>
))}
</VStack>
)}
))}
</VStack>
</Box>
))}
</VStack>
)}

{!isEditing && donation.recurrence !== RecurrenceEnum.NONE && (
<Box mt={6} color="neutral.800" fontSize="sm">
<Text fontWeight={600} mb={3}>
Donation sets up recurring reminders
</Text>
{!isEditing && donation.recurrence !== RecurrenceEnum.NONE && (
<Box mt={6} color="neutral.800" fontSize="sm">
<Text fontWeight={600} mb={3}>
Donation sets up recurring reminders
</Text>

{donation.nextDonationDates &&
donation.nextDonationDates.length > 0 && (
<Box>
<Text fontWeight={600} color="neutral.700" mb={2}>
Upcoming reminder emails
</Text>
<Text color="neutral.700">
{donation.nextDonationDates
.map((date) => formatDate(date))
.join(', ')}
</Text>
</Box>
)}
</Box>
)}
</Dialog.Body>
</Dialog.Content>
</Dialog.Positioner>
{donation.nextDonationDates &&
donation.nextDonationDates.length > 0 && (
<Box>
<Text fontWeight={600} color="neutral.700" mb={2}>
Upcoming reminder emails
</Text>
<Text color="neutral.700">
{donation.nextDonationDates
.map((date) => formatDate(date))
.join(', ')}
</Text>
</Box>
)}
</Box>
)}
</Dialog.Body>
</Dialog.Content>
</Dialog.Positioner>
)}
</Dialog.Root>
);
};
Expand Down
22 changes: 10 additions & 12 deletions apps/frontend/src/containers/adminDonation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,18 +341,16 @@ const AdminDonation: React.FC = () => {
}}
/>

{selectedDonation && (
<DonationDetailsModal
donation={selectedDonation}
isOpen={selectedDonation !== null}
onClose={() => {
setSelectedDonation(null);
navigate(ROUTES.ADMIN_DONATION, { replace: true });
}}
onSuccess={() => fetchDonations()}
onDelete={() => setDeleteDonation(selectedDonation)}
/>
)}
<DonationDetailsModal
donation={selectedDonation}
isOpen={selectedDonation !== null}
onClose={() => {
setSelectedDonation(null);
navigate(ROUTES.ADMIN_DONATION, { replace: true });
}}
onSuccess={() => fetchDonations()}
onDelete={() => setDeleteDonation(selectedDonation)}
/>

{totalPages > 1 && (
<Pagination.Root
Expand Down
18 changes: 8 additions & 10 deletions apps/frontend/src/containers/adminOrderManagement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,16 +307,14 @@ const AdminOrderManagement: React.FC = () => {
);
})}

{selectedOrderId && (
<OrderDetailsModal
orderId={selectedOrderId}
isOpen={true}
onClose={() => {
setSelectedOrderId(null);
navigate(ROUTES.ADMIN_ORDER_MANAGEMENT, { replace: true });
}}
/>
)}
<OrderDetailsModal
orderId={selectedOrderId}
isOpen={selectedOrderId !== null}
onClose={() => {
setSelectedOrderId(null);
navigate(ROUTES.ADMIN_ORDER_MANAGEMENT, { replace: true });
}}
/>
</Box>
);
};
Expand Down
1 change: 1 addition & 0 deletions apps/frontend/src/containers/userManagement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ const VolunteerManagement: React.FC = () => {
<NewVolunteerModal
onSubmitSuccess={() => {
setAlertMessage('User added.', AlertStatus.INFO);
fetchVolunteers();
}}
onSubmitFail={() => {
setAlertMessage('User could not be added.', AlertStatus.ERROR);
Expand Down
Loading