Skip to content

feat(webapp): add 'Set new total' tab to asset quantity adjustment dialog #2756

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
Pallavikumarimdb wants to merge 1 commit into
base: main
Choose a base branch
from
+320 −34
Open

feat(webapp): add 'Set new total' tab to asset quantity adjustment dialog #2756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions apps/webapp/app/components/assets/actions-dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,7 @@ const ConditionalActionsDropdown = () => {
0
) ?? 0)
}
totalQuantity={asset.quantity}
open={isAdjustQuantityDialogOpen}
onOpenChange={setIsAdjustQuantityDialogOpen}
/>
Expand Down
1 change: 1 addition & 0 deletions apps/webapp/app/components/assets/quantity-overview-card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ export function QuantityOverviewCard({
assetId={assetId}
unitOfMeasure={unitOfMeasure}
availableQuantity={custodyAvailableQuantity ?? available}
totalQuantity={quantity}
trigger={
<Button type="button" variant="secondary" size="sm">
Adjust
Expand Down
213 changes: 179 additions & 34 deletions apps/webapp/app/components/assets/quick-adjust-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ import {
AlertDialogTitle,
AlertDialogTrigger,
} from "~/components/shared/modal";
import {
Tabs,
TabsContent,
TabsList,
TabsTrigger,
} from "~/components/shared/tabs";
import { useAutoFocus } from "~/hooks/use-auto-focus";
import { useDisabled } from "~/hooks/use-disabled";
import { isFormProcessing } from "~/utils/form";
Expand All @@ -45,10 +51,13 @@ export interface QuickAdjustDialogProps {
open?: boolean;
/** Callback when the dialog open state changes (controlled mode) */
onOpenChange?: (open: boolean) => void;
/** The current total quantity of the asset */
totalQuantity?: number | null;
}

/**
* Dialog for quickly adding or removing stock from a quantity-tracked asset.
* Supports relative adjustments (Add/Remove) or setting an absolute new total.
*
* Supports two modes:
* - **Uncontrolled** (default): Pass a `trigger` element. The dialog manages
Expand All @@ -69,6 +78,7 @@ export function QuickAdjustDialog({
availableQuantity,
open: controlledOpen,
onOpenChange: controlledOnOpenChange,
totalQuantity,
}: QuickAdjustDialogProps) {
const [internalOpen, setInternalOpen] = useState(false);
const isControlled = controlledOpen !== undefined;
Expand All @@ -85,6 +95,7 @@ export function QuickAdjustDialog({
);
/** Client-side validation error for the quantity field */
const [quantityError, setQuantityError] = useState<string | null>(null);
const [activeTab, setActiveTab] = useState<"adjust" | "total">("adjust");
const fetcher = useFetcher({ key: "adjust-quantity" });
const disabled = useDisabled(fetcher);
const formRef = useRef<HTMLFormElement>(null);
Expand All @@ -110,9 +121,18 @@ export function QuickAdjustDialog({
setOpen(false);
setQuantityError(null);
formRef.current?.reset();
setActiveTab("adjust");
}
}, [fetcher.state, fetcher.data, setOpen]);

useEffect(() => {
if (!open) {
setQuantityError(null);
formRef.current?.reset();
setActiveTab("adjust");
}
}, [open]);

/**
* Submits the adjustment form with the given direction and category.
* "Add" maps to direction=add, category=RESTOCK.
Expand All @@ -128,6 +148,11 @@ export function QuickAdjustDialog({
const formData = new FormData(form);
const qty = Number(formData.get("quantity"));

if (isNaN(qty) || qty <= 0) {
setQuantityError("Quantity must be a positive number.");
return;
}

Comment on lines +151 to +155

@coderabbitai coderabbitai Bot Jul 28, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win

No integer/whole-unit validation on quantity fields.

Both handleSubmit (qty <= 0) and handleSetTotal (newTotal < 0) only guard against non-numeric/negative input, not fractional values. Since asset quantities are discrete units, a user typing e.g. 1.5 passes validation and gets submitted as a fractional delta.

🛡️ Proposed fix 
-    if (isNaN(qty) || qty <= 0) {
-      setQuantityError("Quantity must be a positive number.");
+    if (isNaN(qty) || qty <= 0 || !Number.isInteger(qty)) {
+      setQuantityError("Quantity must be a positive whole number.");
       return;
     }
-    if (isNaN(newTotal) || newTotal < 0) {
-      setQuantityError("New total must be a non-negative number.");
+    if (isNaN(newTotal) || newTotal < 0 || !Number.isInteger(newTotal)) {
+      setQuantityError("New total must be a non-negative whole number.");
       return;
     }

Also applies to: 193-196

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@apps/webapp/app/components/assets/quick-adjust-dialog.tsx` around lines 151 -
155, Update the quantity validation in both handleSubmit and handleSetTotal to
reject fractional values, while retaining the existing non-numeric and
non-positive/negative checks. Ensure only finite whole-unit quantities can be
submitted or used as totals, and preserve the current error-handling flow.

/** Client-side guard: can't remove more than available */
if (
direction === "subtract" &&
Expand All @@ -150,6 +175,62 @@ export function QuickAdjustDialog({
});
}

/**
* Submits the absolute total adjustment form by calculating the difference.
*/
function handleSetTotal() {
const form = formRef.current;
if (!form || totalQuantity === undefined || totalQuantity === null) return;

const formData = new FormData(form);
const newTotalVal = formData.get("newTotal");
if (newTotalVal === null || newTotalVal === "") {
setQuantityError("Please enter a new total quantity.");
return;
}
const newTotal = Number(newTotalVal);

if (isNaN(newTotal) || newTotal < 0) {
setQuantityError("New total must be a non-negative number.");
return;
}

if (newTotal === totalQuantity) {
setQuantityError("New total is the same as the current total quantity.");
return;
}

if (newTotal > totalQuantity) {
const diff = newTotal - totalQuantity;
formData.set("quantity", String(diff));
formData.set("direction", "add");
formData.set("category", "RESTOCK");
} else {
const diff = totalQuantity - newTotal;

/** Client-side guard: can't remove more than available */
if (availableQuantity != null && diff > availableQuantity) {
const minNewTotal = totalQuantity - availableQuantity;
setQuantityError(
`Cannot reduce total to ${newTotal} ${unitLabel}. This would remove ${diff} ${unitLabel}, but only ${availableQuantity} are available (the rest is in custody). Minimum total allowed is ${minNewTotal} ${unitLabel}.`
);
return;
}

formData.set("quantity", String(diff));
formData.set("direction", "subtract");
formData.set("category", "LOSS");
}

setQuantityError(null);
void fetcher.submit(formData, {
method: "POST",
action: "/api/assets/adjust-quantity",
});
}

const hasTotal = totalQuantity !== undefined && totalQuantity !== null;

return (
<AlertDialog open={open} onOpenChange={setOpen}>
{trigger ? (
Expand All @@ -160,8 +241,9 @@ export function QuickAdjustDialog({
<AlertDialogHeader>
<AlertDialogTitle>Adjust Quantity</AlertDialogTitle>
<AlertDialogDescription>
Add or remove stock for this asset. Enter the number of {unitLabel}{" "}
to adjust.
{hasTotal && activeTab === "total"
? "Set the new total stock for this asset."
: `Add or remove stock for this asset. Enter the number of ${unitLabel} to adjust.`}
</AlertDialogDescription>
</AlertDialogHeader>

Expand All @@ -172,21 +254,71 @@ export function QuickAdjustDialog({
>
<input type="hidden" name="assetId" value={assetId} />

<div className="flex flex-col gap-4">
<Input
ref={quantityInputRef}
name="quantity"
type="number"
label={`Quantity (${unitLabel})`}
placeholder="Enter quantity"
min={1}
step={1}
required
data-dialog-initial-focus
error={quantityError || serverError || undefined}
onChange={() => setQuantityError(null)}
/>
{hasTotal ? (
<Tabs
value={activeTab}
onValueChange={(v) => setActiveTab(v as "adjust" | "total")}
className="w-full"
>
<TabsList className="mb-4 grid w-full grid-cols-2">
<TabsTrigger value="adjust">Adjust by amount</TabsTrigger>
<TabsTrigger value="total">Set new total</TabsTrigger>
</TabsList>

<TabsContent value="adjust" className="flex flex-col gap-4">
<Input
ref={quantityInputRef}
name="quantity"
type="number"
label={`Quantity (${unitLabel})`}
placeholder="Enter quantity"
min={1}
step={1}
required={activeTab === "adjust"}
error={quantityError || serverError || undefined}
onChange={() => setQuantityError(null)}
/>
</TabsContent>

<TabsContent value="total" className="flex flex-col gap-4">
<div className="mb-1 text-sm text-gray-500">
Current total:{" "}
<span className="font-semibold text-gray-900">
{totalQuantity} {unitLabel}
</span>
</div>
<Input
name="newTotal"
type="number"
label={`New Total Quantity (${unitLabel})`}
placeholder="Enter new total quantity"
min={0}
step={1}
required={activeTab === "total"}
error={quantityError || serverError || undefined}
onChange={() => setQuantityError(null)}
/>
</TabsContent>
</Tabs>
Comment on lines +257 to +302

@coderabbitai coderabbitai Bot Jul 28, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win

No focus management when switching to the "Set new total" tab.

The "adjust" input uses quantityInputRef + useAutoFocus to move focus on open, but the "New Total Quantity" input in the total TabsContent has no equivalent, so keyboard users switching tabs land with no input focused.

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@apps/webapp/app/components/assets/quick-adjust-dialog.tsx` around lines 257 -
302, The “Set new total” tab does not move focus to its input when selected.
Update the total-tab flow around the `Tabs` and `newTotal` `Input` to add
equivalent focus management for the “New Total Quantity” field when `activeTab`
changes to `"total"`, while preserving the existing `quantityInputRef` behavior
for the adjust tab.

) : (
<div className="flex flex-col gap-4">
<Input
ref={quantityInputRef}
name="quantity"
type="number"
label={`Quantity (${unitLabel})`}
placeholder="Enter quantity"
min={1}
step={1}
required
data-dialog-initial-focus
error={quantityError || serverError || undefined}
onChange={() => setQuantityError(null)}
/>
</div>
)}

<div className="mt-4">
<Input
name="note"
inputType="textarea"
Expand All @@ -197,30 +329,43 @@ export function QuickAdjustDialog({
</div>
</fetcher.Form>

<AlertDialogFooter className="mt-4 ">
<AlertDialogFooter className="mt-4">
<AlertDialogCancel asChild>
<Button type="button" variant="secondary" disabled={isSubmitting}>
Cancel
</Button>
</AlertDialogCancel>

<Button
type="button"
variant="secondary"
onClick={() => handleSubmit("subtract")}
disabled={disabled}
>
{isSubmitting ? "Removing..." : "Remove"}
</Button>

<Button
type="button"
variant="primary"
onClick={() => handleSubmit("add")}
disabled={disabled}
>
{isSubmitting ? "Adding..." : "Add"}
</Button>
{hasTotal && activeTab === "total" ? (
<Button
type="button"
variant="primary"
onClick={handleSetTotal}
disabled={disabled}
>
{isSubmitting ? "Saving..." : "Set Total"}
</Button>
) : (
<>
<Button
type="button"
variant="secondary"
onClick={() => handleSubmit("subtract")}
disabled={disabled}
>
{isSubmitting ? "Removing..." : "Remove"}
</Button>

<Button
type="button"
variant="primary"
onClick={() => handleSubmit("add")}
disabled={disabled}
>
{isSubmitting ? "Adding..." : "Add"}
</Button>
</>
)}
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
Expand Down
Loading