diff --git a/src/components/PaymentRequest/ManagePaymentRequest.jsx b/src/components/PaymentRequest/ManagePaymentRequest.jsx index 8365a66d..ec451311 100644 --- a/src/components/PaymentRequest/ManagePaymentRequest.jsx +++ b/src/components/PaymentRequest/ManagePaymentRequest.jsx @@ -344,7 +344,7 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
{ displayField = "Status"; break; case "submittedBy": - key = `${item?.createdBy?.firstName ?? ""} ${ - item.createdBy?.lastName ?? "" - }`.trim(); + key = `${item?.createdBy?.firstName ?? ""} ${item.createdBy?.lastName ?? "" + }`.trim(); displayField = "Submitted By"; break; case "project": @@ -97,9 +96,8 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => { label: "Submitted By", align: "text-start", getValue: (e) => - `${e.createdBy?.firstName ?? ""} ${ - e.createdBy?.lastName ?? "" - }`.trim() || "N/A", + `${e.createdBy?.firstName ?? ""} ${e.createdBy?.lastName ?? "" + }`.trim() || "N/A", customRender: (e) => (
{ lastName={e.createdBy?.lastName} /> - {`${e.createdBy?.firstName ?? ""} ${ - e.createdBy?.lastName ?? "" - }`.trim() || "N/A"} + {`${e.createdBy?.firstName ?? ""} ${e.createdBy?.lastName ?? "" + }`.trim() || "N/A"}
), @@ -143,9 +140,8 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => { align: "text-center", getValue: (e) => ( {e?.expenseStatus?.name || "Unknown"} @@ -181,10 +177,15 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => { "Action", ]; if (isLoading) return ; - + const grouped = groupBy - ? groupByField(data?.data ?? [], groupBy) + ? Object.fromEntries( + Object.entries(groupByField(data?.data ?? [], groupBy)).sort(([keyA], [keyB]) => + keyA.localeCompare(keyB) + ) + ) : { All: data?.data ?? [] }; + const IsGroupedByDate = [ { key: "transactionDate", displayField: "Transaction Date" }, { key: "createdAt", displayField: "created Date" }, @@ -367,9 +368,8 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => { {[...Array(totalPages)].map((_, index) => (