@mohasinac/appkit 4.30.19 → 4.31.1

package/dist/features/admin/components/AdminOrderEditorView.js

@@ -14,6 +14,7 @@ import { ACTIONS } from "../../../_internal/shared/actions/action-registry";
 import { toCurrency } from "../hooks/useAdminListingData";
 import { adminOrderUpdateSchema } from "../schemas/admin-ops-forms";
 import { FormErrorSummary } from "../../../ui/forms/FormErrorSummary";
+import { ValidationError } from "../../../errors/validation-error";
 const STATUS_OPTIONS = [
     { label: "Pending", value: "pending" },
     { label: "Processing", value: "processing" },
@@ -42,7 +43,15 @@ export function AdminOrderEditorView({ open, onClose, orderId, orderLabel, curre
     const [notes, setNotes] = React.useState("");
     const [refundAmount, setRefundAmount] = React.useState("");
     const [isVerifyingPayment, setIsVerifyingPayment] = useState(false);
+    /*
+     * 🛑 `reviewNote` belongs to the PAYMENT REVIEW actions, not to "Save
+     * changes". It is not in `adminOrderUpdateSchema` and never reaches the
+     * order-update payload — an admin who typed a note and pressed Save lost it
+     * silently. The label and the panel heading now say which buttons consume it;
+     * the structural fix (two forms, two surfaces) is the tabbing in W8.
+     */
     const [reviewNote, setReviewNote] = React.useState("");
+    const [reviewNoteError, setReviewNoteError] = React.useState(null);
     const [isRequestingReupload, setIsRequestingReupload] = useState(false);
     const [isRejectingFraud, setIsRejectingFraud] = useState(false);
     // This used to inline `paymentMethod === "cash" || === "upi_manual"`, which
@@ -79,10 +88,19 @@ export function AdminOrderEditorView({ open, onClose, orderId, orderLabel, curre
                 payload.trackingNumber = trackingNumber;
             if (carrier)
                 payload.carrier = carrier;
-            if (refundAmount) {
-                const amount = Math.round(parseFloat(refundAmount) * 100) / 100;
-                if (!isNaN(amount) && amount > 0)
-                    payload.refundAmount = amount;
+            if (refundAmount.trim()) {
+                /*
+                 * Parsed through the schema, which coerces, requires > 0 and caps the
+                 * magnitude. It used to be `parseFloat` guarded by `!isNaN && > 0` with
+                 * no else — so typing "abc" or "-5" DROPPED the refund silently and the
+                 * save reported success with nothing recorded. A refund that does not
+                 * parse must stop the save, not disappear from it.
+                 */
+                const parsed = adminOrderUpdateSchema.shape.refundAmount.safeParse(refundAmount);
+                if (!parsed.success) {
+                    throw new ValidationError(parsed.error.issues[0]?.message ?? "Enter the refund amount as a number.");
+                }
+                payload.refundAmount = Math.round(parsed.data * 100) / 100;
             }
             await apiClient.patch(ADMIN_ENDPOINTS.ORDER_BY_ID(orderId), payload);
         },
@@ -92,6 +110,12 @@ export function AdminOrderEditorView({ open, onClose, orderId, orderLabel, curre
             onClose();
         },
     });
+    /** Typing clears the "note required" error the two review actions raise. */
+    const handleReviewNoteChange = (value) => {
+        setReviewNote(value);
+        if (reviewNoteError)
+            setReviewNoteError(null);
+    };
     const handleVerifyPayment = async () => {
         if (!orderId)
             return;
@@ -104,15 +128,22 @@ export function AdminOrderEditorView({ open, onClose, orderId, orderLabel, curre
         }
         catch (err) {
             void normalizeError(err);
-            showToast(err?.message ?? "Failed to verify payment.", "error");
+            showToast("Failed to verify payment.", "error");
         }
         finally {
             setIsVerifyingPayment(false);
         }
     };
     const handleRequestReupload = async () => {
-        if (!orderId || !reviewNote.trim())
+        if (!orderId)
             return;
+        // Both review actions used to `return` silently on an empty note, so the
+        // button did nothing and said nothing. Say what is missing.
+        if (!reviewNote.trim()) {
+            setReviewNoteError("Write a note explaining what the buyer needs to re-upload.");
+            return;
+        }
+        setReviewNoteError(null);
         setIsRequestingReupload(true);
         try {
             await apiClient.patch(ADMIN_ENDPOINTS.ORDER_PAYMENT_REUPLOAD(orderId), { note: reviewNote });
@@ -122,15 +153,21 @@ export function AdminOrderEditorView({ open, onClose, orderId, orderLabel, curre
         }
         catch (err) {
             void normalizeError(err);
-            showToast(err?.message ?? "Failed to request re-upload.", "error");
+            // Authored copy. `err.message` is server text — Root Cause #86.
+            showToast("Failed to request re-upload.", "error");
         }
         finally {
             setIsRequestingReupload(false);
         }
     };
     const handleRejectFraud = async () => {
-        if (!orderId || !reviewNote.trim())
+        if (!orderId)
+            return;
+        if (!reviewNote.trim()) {
+            setReviewNoteError("Record why this payment is being rejected as fraud.");
             return;
+        }
+        setReviewNoteError(null);
         setIsRejectingFraud(true);
         try {
             await apiClient.patch(ADMIN_ENDPOINTS.ORDER_PAYMENT_REJECT_FRAUD(orderId), { note: reviewNote });
@@ -140,7 +177,7 @@ export function AdminOrderEditorView({ open, onClose, orderId, orderLabel, curre
         }
         catch (err) {
             void normalizeError(err);
-            showToast(err?.message ?? "Failed to reject payment.", "error");
+            showToast("Failed to reject payment.", "error");
         }
         finally {
             setIsRejectingFraud(false);
@@ -149,5 +186,5 @@ export function AdminOrderEditorView({ open, onClose, orderId, orderLabel, curre
     return (_jsx(SideDrawer, { isOpen: open, onClose: onClose, title: orderLabel ? `Order: ${orderLabel}` : "Update Order", children: _jsxs(Form, { schema: adminOrderUpdateSchema, onSubmit: (e) => {
                 e.preventDefault();
                 saveMutation.mutate();
-            }, spacing: "md", padding: "md", children: [_jsx(FormErrorSummary, {}), addons && _jsx(OrderAddonBadges, { order: addons, variant: "detail" }), items && items.length > 0 && (_jsxs(Stack, { gap: "xs", children: [_jsxs(Label, { size: "sm", weight: "medium", color: "primary", children: ["Items (", items.length, ")"] }), _jsx(Div, { className: "divide-y divide-[var(--appkit-color-border)] border border-[var(--appkit-color-border)]", rounded: "lg", children: items.map((item, i) => (_jsxs(Div, { layout: "flex", align: "center", gap: "3", padding: "sm", children: [_jsx(Div, { className: "h-10 w-10 shrink-0", rounded: "md", overflow: "hidden", children: _jsx(MediaImage, { src: item.image, alt: item.title, size: "thumbnail" }) }), _jsxs(Div, { className: "min-w-0 flex-1", children: [_jsx(Text, { size: "sm", className: "truncate", weight: "medium", children: item.title }), _jsxs(Text, { size: "xs", color: "muted", children: ["Qty: ", item.quantity, " \u00D7 ", toCurrency(item.unitPrice)] })] }), _jsx(Text, { size: "sm", className: "shrink-0", weight: "semibold", children: toCurrency(item.totalPrice) })] }, item.productId || i))) })] })), _jsx(Select, { label: "Order status", options: STATUS_OPTIONS, value: status, onValueChange: setStatus }), _jsx(Input, { label: "Tracking number (optional)", value: trackingNumber, onChange: (e) => setTrackingNumber(e.target.value), placeholder: "e.g. DEL1234567890IN" }), _jsx(Select, { label: "Carrier (optional)", options: CARRIER_OPTIONS, value: carrier, onValueChange: setCarrier }), _jsxs(Stack, { gap: "xs", children: [_jsx(Label, { size: "sm", weight: "medium", color: "primary", children: "Internal note (optional)" }), _jsx(Textarea, { value: notes, onChange: (e) => setNotes(e.target.value), rows: 3, placeholder: "Reason for status change, escalation notes\u2026" })] }), (status === "refunded" || status === "return_requested") && (_jsx(Input, { label: "Refund amount \u20B9 (optional)", type: "number", min: "0", step: "0.01", value: refundAmount, onChange: (e) => setRefundAmount(e.target.value), placeholder: "e.g. 499.00" })), isManualPayment && (_jsxs(Stack, { gap: "xs", children: [_jsx(Label, { size: "sm", weight: "medium", color: "primary", children: "Payment Proof" }), isRejected && (_jsx(Text, { size: "xs", className: "text-error", weight: "medium", children: "Payment rejected as fraud \u2014 no further action available here." })), isReuploadRequested && !isVerified && (_jsx(Text, { size: "xs", className: "text-warning", weight: "medium", children: "Re-upload requested \u2014 waiting for the buyer to submit a new proof." })), paymentProofUrl ? (_jsxs(Stack, { gap: "xs", children: [_jsx(Div, { border: "default", rounded: "lg", overflow: "hidden", children: _jsx(MediaImage, { src: paymentProofUrl, alt: "Payment screenshot", size: "card" }) }), paymentTransactionId && (_jsxs(Text, { size: "xs", color: "muted", children: ["UTR: ", _jsx(Text, { as: "span", size: "xs", weight: "medium", children: paymentTransactionId })] })), needsVerification && (_jsxs(Stack, { gap: "xs", children: [(displayedUpiId || buyerReportedUpiId) && (_jsxs(Stack, { gap: "xs", children: [_jsxs(Text, { size: "xs", color: "muted", children: ["Expected UPI: ", _jsx(Text, { as: "span", size: "xs", weight: "medium", children: displayedUpiId || "—" }), " · ", "Buyer reported: ", _jsx(Text, { as: "span", size: "xs", weight: "medium", children: buyerReportedUpiId || "—" })] }), paymentUpiMismatch && (_jsx(Div, { rounded: "lg", padding: "inlineSm", className: "border border-error/20", surface: "danger-surface", children: _jsx(Text, { size: "xs", className: "text-error", weight: "semibold", children: "UPI mismatch \u2014 buyer-reported ID doesn't match the one shown for this order." }) }))] })), _jsxs(Text, { size: "xs", color: "muted", children: ["Buyer marked as paid: ", _jsx(Text, { as: "span", size: "xs", weight: "medium", children: buyerMarkedPaid ? "Yes" : "No" }), " · ", "Fraud agreement accepted: ", _jsx(Text, { as: "span", size: "xs", weight: "medium", children: buyerFraudAgreementAccepted ? "Yes" : "No" })] }), _jsxs(Stack, { gap: "xs", children: [_jsx(Label, { size: "sm", weight: "medium", color: "primary", children: "Review note (required for re-upload / reject)" }), _jsx(Textarea, { value: reviewNote, onChange: (e) => setReviewNote(e.target.value), rows: 2, placeholder: "e.g. Screenshot is blurry \u2014 amount not readable / UPI ID doesn't match order" })] }), _jsx(Button, { type: "button", action: ACTIONS.ADMIN["verify-payment"], onClick: handleVerifyPayment, isLoading: isVerifyingPayment, disabled: isVerifyingPayment, variant: "primary", className: "w-full" }), _jsx(Button, { type: "button", action: ACTIONS.ADMIN["request-payment-reupload"], onClick: handleRequestReupload, isLoading: isRequestingReupload, disabled: isRequestingReupload || !reviewNote.trim(), variant: "secondary", className: "w-full" }), _jsx(Button, { type: "button", action: ACTIONS.ADMIN["reject-payment-fraud"], onClick: handleRejectFraud, isLoading: isRejectingFraud, disabled: isRejectingFraud || !reviewNote.trim(), variant: "danger", className: "w-full" })] })), isVerified && (_jsx(Div, { rounded: "lg", padding: "inlineSm", className: "border border-success/20", surface: "success-surface", children: _jsx(Text, { size: "xs", className: "text-success", weight: "medium", children: "Payment verified" }) }))] })) : (_jsx(Text, { size: "xs", color: "faint", children: "No proof uploaded yet." }))] })), _jsxs(FormActions, { align: "right", children: [_jsx(Button, { type: "button", variant: "secondary", onClick: onClose, children: "Cancel" }), _jsx(Button, { type: "submit", isLoading: saveMutation.isPending, disabled: !orderId || saveMutation.isPending, children: "Save changes" })] })] }) }));
+            }, spacing: "md", padding: "md", children: [_jsx(FormErrorSummary, {}), addons && _jsx(OrderAddonBadges, { order: addons, variant: "detail" }), items && items.length > 0 && (_jsxs(Stack, { gap: "xs", children: [_jsxs(Label, { size: "sm", weight: "medium", color: "primary", children: ["Items (", items.length, ")"] }), _jsx(Div, { className: "divide-y divide-[var(--appkit-color-border)] border border-[var(--appkit-color-border)]", rounded: "lg", children: items.map((item, i) => (_jsxs(Div, { layout: "flex", align: "center", gap: "3", padding: "sm", children: [_jsx(Div, { className: "h-10 w-10 shrink-0", rounded: "md", overflow: "hidden", children: _jsx(MediaImage, { src: item.image, alt: item.title, size: "thumbnail" }) }), _jsxs(Div, { className: "min-w-0 flex-1", children: [_jsx(Text, { size: "sm", className: "truncate", weight: "medium", children: item.title }), _jsxs(Text, { size: "xs", color: "muted", children: ["Qty: ", item.quantity, " \u00D7 ", toCurrency(item.unitPrice)] })] }), _jsx(Text, { size: "sm", className: "shrink-0", weight: "semibold", children: toCurrency(item.totalPrice) })] }, item.productId || i))) })] })), _jsx(Select, { label: "Order status", options: STATUS_OPTIONS, value: status, onValueChange: setStatus }), _jsx(Input, { label: "Tracking number (optional)", value: trackingNumber, onChange: (e) => setTrackingNumber(e.target.value), placeholder: "e.g. DEL1234567890IN" }), _jsx(Select, { label: "Carrier (optional)", options: CARRIER_OPTIONS, value: carrier, onValueChange: setCarrier }), _jsxs(Stack, { gap: "xs", children: [_jsx(Label, { size: "sm", weight: "medium", color: "primary", children: "Internal note (optional)" }), _jsx(Textarea, { value: notes, onChange: (e) => setNotes(e.target.value), rows: 3, placeholder: "Reason for status change, escalation notes\u2026" })] }), (status === "refunded" || status === "return_requested") && (_jsx(Input, { label: "Refund amount \u20B9 (optional)", type: "number", min: "0", step: "0.01", value: refundAmount, onChange: (e) => setRefundAmount(e.target.value), placeholder: "e.g. 499.00" })), isManualPayment && (_jsxs(Stack, { gap: "xs", children: [_jsx(Label, { size: "sm", weight: "medium", color: "primary", children: "Payment Proof" }), isRejected && (_jsx(Text, { size: "xs", className: "text-error", weight: "medium", children: "Payment rejected as fraud \u2014 no further action available here." })), isReuploadRequested && !isVerified && (_jsx(Text, { size: "xs", className: "text-warning", weight: "medium", children: "Re-upload requested \u2014 waiting for the buyer to submit a new proof." })), paymentProofUrl ? (_jsxs(Stack, { gap: "xs", children: [_jsx(Div, { border: "default", rounded: "lg", overflow: "hidden", children: _jsx(MediaImage, { src: paymentProofUrl, alt: "Payment screenshot", size: "card" }) }), paymentTransactionId && (_jsxs(Text, { size: "xs", color: "muted", children: ["UTR: ", _jsx(Text, { as: "span", size: "xs", weight: "medium", children: paymentTransactionId })] })), needsVerification && (_jsxs(Stack, { gap: "xs", children: [(displayedUpiId || buyerReportedUpiId) && (_jsxs(Stack, { gap: "xs", children: [_jsxs(Text, { size: "xs", color: "muted", children: ["Expected UPI: ", _jsx(Text, { as: "span", size: "xs", weight: "medium", children: displayedUpiId || "—" }), " · ", "Buyer reported: ", _jsx(Text, { as: "span", size: "xs", weight: "medium", children: buyerReportedUpiId || "—" })] }), paymentUpiMismatch && (_jsx(Div, { rounded: "lg", padding: "inlineSm", className: "border border-error/20", surface: "danger-surface", children: _jsx(Text, { size: "xs", className: "text-error", weight: "semibold", children: "UPI mismatch \u2014 buyer-reported ID doesn't match the one shown for this order." }) }))] })), _jsxs(Text, { size: "xs", color: "muted", children: ["Buyer marked as paid: ", _jsx(Text, { as: "span", size: "xs", weight: "medium", children: buyerMarkedPaid ? "Yes" : "No" }), " · ", "Fraud agreement accepted: ", _jsx(Text, { as: "span", size: "xs", weight: "medium", children: buyerFraudAgreementAccepted ? "Yes" : "No" })] }), _jsxs(Stack, { gap: "xs", children: [_jsx(Label, { size: "sm", weight: "medium", color: "primary", children: "Review note" }), _jsxs(Text, { size: "xs", color: "muted", children: ["Sent with ", _jsx(Text, { as: "span", size: "xs", weight: "medium", children: "Request re-upload" }), " or", " ", _jsx(Text, { as: "span", size: "xs", weight: "medium", children: "Reject as fraud" }), " below. Not saved by \u201CSave changes\u201D."] }), _jsx(Textarea, { value: reviewNote, onChange: (e) => handleReviewNoteChange(e.target.value), rows: 2, "aria-invalid": reviewNoteError ? true : undefined, placeholder: "e.g. Screenshot is blurry \u2014 amount not readable / UPI ID doesn't match order" }), reviewNoteError && (_jsx(Text, { size: "xs", color: "error", role: "alert", children: reviewNoteError }))] }), _jsx(Button, { type: "button", action: ACTIONS.ADMIN["verify-payment"], onClick: handleVerifyPayment, isLoading: isVerifyingPayment, disabled: isVerifyingPayment, variant: "primary", className: "w-full" }), _jsx(Button, { type: "button", action: ACTIONS.ADMIN["request-payment-reupload"], onClick: handleRequestReupload, isLoading: isRequestingReupload, disabled: isRequestingReupload, variant: "secondary", className: "w-full" }), _jsx(Button, { type: "button", action: ACTIONS.ADMIN["reject-payment-fraud"], onClick: handleRejectFraud, isLoading: isRejectingFraud, disabled: isRejectingFraud, variant: "danger", className: "w-full" })] })), isVerified && (_jsx(Div, { rounded: "lg", padding: "inlineSm", className: "border border-success/20", surface: "success-surface", children: _jsx(Text, { size: "xs", className: "text-success", weight: "medium", children: "Payment verified" }) }))] })) : (_jsx(Text, { size: "xs", color: "faint", children: "No proof uploaded yet." }))] })), _jsxs(FormActions, { align: "right", children: [_jsx(Button, { type: "button", variant: "secondary", onClick: onClose, children: "Cancel" }), _jsx(Button, { type: "submit", isLoading: saveMutation.isPending, disabled: !orderId || saveMutation.isPending, children: "Save changes" })] })] }) }));
 }

package/dist/features/admin/components/AdminPrizeDrawsView.js

@@ -12,6 +12,7 @@ import { ROUTES } from "../../../constants";
 import { toRecordArray, toRelativeDate, toCurrency, toStringValue, } from "../hooks/useAdminListingData";
 import { DataListingView } from "./DataListingView";
 import { useAvailabilityScope } from "../../products/hooks/useAvailabilityScope";
+import { PRODUCT_FIELDS } from "../../../constants/field-names";
 const PRIZE_DRAW_TYPES = ["prize-draw"];
 const STATUS_VARIANT = {
     published: "success",
@@ -56,10 +57,21 @@ const PRIZE_DRAW_COLUMNS = [
     },
 ];
 export function AdminPrizeDrawsView({ children, ...props }) {
+    /*
+     * 🛑 Before the early return, not after.
+     *
+     * This hook used to sit BELOW the `React.Children.count` branch, so the
+     * component called a different number of hooks depending on whether it was
+     * given children — a rules-of-hooks violation that React only reports once
+     * the branch actually flips at runtime. The page renders `<AdminPrizeDrawsView />`
+     * with no children, so the violating path was the one always taken and the
+     * bug stayed latent. `SellerPreOrdersView` had the identical shape and was
+     * deleted in the same commit for being unreachable.
+     */
+    const scope = useAvailabilityScope(PRIZE_DRAW_TYPES);
     if (React.Children.count(children) > 0) {
         return (_jsx(ListingLayout, { portal: "admin", ...props, children: children }));
     }
-    const scope = useAvailabilityScope(PRIZE_DRAW_TYPES);
     const config = {
         portal: "admin",
         title: "Prize Draws",
@@ -95,7 +107,9 @@ export function AdminPrizeDrawsView({ children, ...props }) {
         getTotal: (response, mappedRows) => typeof response.total === "number" ? response.total : mappedRows.length,
         buildFilters: (state) => {
             const status = state.status && state.status !== "All" ? sieveFilter("status", SIEVE_OP.EQ, state.status) : null;
-            return ["listingType==prize-draw", status].filter(Boolean).join(",");
+            return [sieveFilter(PRODUCT_FIELDS.LISTING_TYPE, SIEVE_OP.EQ, "prize-draw"), status]
+                .filter(Boolean)
+                .join(",");
         },
         buildExtraParams: () => scope.extraParams,
         renderAboveContent: scope.renderAboveContent,

package/dist/features/admin/components/AdminSidebar.d.ts

@@ -1,11 +1,15 @@
+import type { SidebarNavItem } from "../../../_internal/shared/features/layout/types";
 import React from "react";
-export interface AdminNavItem {
-    href: string;
-    label: string;
-    icon?: React.ReactNode;
-    /** Permission required to see this item. If omitted, always visible. */
-    requiredPermission?: string;
-}
+/**
+ * An admin sidebar entry.
+ *
+ * Extends `SidebarNavItem` rather than restating it. There were EIGHT
+ * divergent nav-item interfaces in the tree and they had drifted on which
+ * fields even existed — this one carried `requiredPermission`, the store one
+ * carried `badge`, the user one `confirm`, and none of the three had the `id`
+ * that `filterNavItems` keys everything off.
+ */
+export type AdminNavItem = SidebarNavItem;
 export interface AdminNavGroup {
     title: string;
     items: AdminNavItem[];