Skip to content

[ENG-613] Added expiry date to supply delivery table #16579

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
Jacobjeevan wants to merge 4 commits into
base: develop
Choose a base branch
from
+12 −1
Open

[ENG-613] Added expiry date to supply delivery table #16579

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f339559
Add expiry date to supply delivery table
Jacobjeevan Jul 17, 2026
703e087
care-loop: address review feedback (round 2)
Jacobjeevan Jul 17, 2026
089ff1b
Merge branch 'develop' into supply-delivery-expiry-date
amjithtitus09 Jul 31, 2026
fc52de5
Merge branch 'develop' into supply-delivery-expiry-date
amjithtitus09 Jul 31, 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
13 changes: 12 additions & 1 deletion src/pages/Facility/services/inventory/SupplyDeliveryTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { formatDate } from "date-fns";
import { formatDate, parseISO } from "date-fns";
import { EllipsisVertical } from "lucide-react";
import { Link } from "raviger";
import { useEffect, useMemo, useRef } from "react";
Expand Down Expand Up @@ -190,6 +190,7 @@ export function SupplyDeliveryTable({
<TableHead rowSpan={2}>{t("#")}</TableHead>
<TableHead rowSpan={2}>{t("item")}</TableHead>
<TableHead rowSpan={2}>{t("batch")}</TableHead>
<TableHead rowSpan={2}>{t("expiry")}</TableHead>
<TableHead rowSpan={2}>{t("requested_qty")}</TableHead>
{!internal && <TableHead rowSpan={2}>{t("pack_size")}</TableHead>}
{!internal && <TableHead rowSpan={2}>{t("pack_qty")}</TableHead>}
Expand Down Expand Up @@ -286,6 +287,16 @@ export function SupplyDeliveryTable({
{delivery.supplied_inventory_item?.product?.batch?.lot_number ||
"-"}
</TableCell>
<TableCell>
{(() => {
const expiry =
delivery.supplied_inventory_item?.product?.expiration_date ||
delivery.supplied_item?.expiration_date;
return expiry
? formatDate(parseISO(expiry), "dd/MM/yyyy")
: "-";
})()}

@github-actions github-actions Bot Jul 31, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

An IIFE inside JSX? Really? In 2026? Just extract expiry to a const before the return statement — you know, like a normal human. The entire IIFE exists to derive one variable; that's what const is for.

const expiry =
  delivery.supplied_inventory_item?.product?.expiration_date ||
  delivery.supplied_item?.expiration_date;
// ...
<TableCell>
  {expiry ? formatDate(parseISO(expiry), "dd/MM/yyyy") : "-"}
</TableCell>

Cleaner, readable, no gymnastics required.

</TableCell>
Comment thread
coderabbitai[bot] marked this conversation as resolved.
<TableCell>
{delivery.supply_request
? round(delivery.supply_request.quantity)
Expand Down
Loading