Merge branch 'main' into codex/refactor-additemscreen-for-quantity-input

src/components/PickItemRow.tsx

@@ -1,8 +1,7 @@
-import { Chip, Stack, Typography } from '@mui/material';
-import { PickItem, PickItemStatus } from '../models/PickItem';
+import { Add, Delete } from '@mui/icons-material';
+import { Button, Checkbox, Stack, Typography } from '@mui/material';
+import { PickItem } from '../models/PickItem';
 import { Product } from '../models/Product';
-import { useLongPress } from '../hooks/useLongPress';
-import { useSwipe } from '../hooks/useSwipe';
 
 interface PickItemRowProps {
   item: PickItem;
@@ -13,12 +12,6 @@ interface PickItemRowProps {
   onSwipeRight: () => void;
 }
 
-const statusColor: Record<PickItemStatus, 'default' | 'success' | 'warning'> = {
-  pending: 'default',
-  picked: 'success',
-  skipped: 'warning',
-};
-
 export const PickItemRow = ({
   item,
   product,
@@ -39,8 +32,6 @@ export const PickItemRow = ({
       justifyContent="space-between"
       spacing={1}
       sx={{ p: 1, borderRadius: 1, bgcolor: 'background.paper', boxShadow: 1 }}
-      {...longPressHandlers}
-      {...swipeHandlers}
     >
       <div>
         <Typography variant="subtitle1">{product?.name ?? 'Unknown product'}</Typography>

src/db/index.ts

@@ -90,6 +90,64 @@ export class StockFillDB extends Dexie {
       pickItems: 'id, pick_list_id, product_id, status, created_at, updated_at',
       categories: 'id, name, created_at, updated_at',
     });
+
+    this.version(5)
+      .stores({
+        products: 'id, name, category, &barcode, archived, created_at, updated_at',
+        areas: 'id, name, created_at, updated_at',
+        pickLists: 'id, area_id, created_at, completed_at',
+        pickItems:
+          'id, pick_list_id, product_id, status, is_carton, quantity, created_at, updated_at',
+        categories: 'id, name, created_at, updated_at',
+      })
+      .upgrade(async (tx) => {
+        const items = await tx.table('pickItems').toArray();
+        const now = Date.now();
+
+        await Promise.all(
+          items.map(async (item) => {
+            const hasNewFields =
+              typeof (item as PickItem).quantity === 'number' &&
+              typeof (item as PickItem).is_carton === 'boolean';
+
+            if (hasNewFields) return undefined;
+
+            const legacyUnits = Number((item as PickItem).quantity_units ?? 0);
+            const legacyBulk = Number((item as PickItem).quantity_bulk ?? 0);
+
+            if (legacyUnits > 0 && legacyBulk > 0) {
+              await tx.table('pickItems').update(item.id, {
+                quantity: legacyUnits,
+                is_carton: false,
+                updated_at: now,
+              });
+
+              return tx.table('pickItems').add({
+                ...item,
+                id: uuidv4(),
+                quantity: legacyBulk,
+                is_carton: true,
+                created_at: (item as PickItem).created_at ?? now,
+                updated_at: now,
+              });
+            }
+
+            if (legacyBulk > 0) {
+              return tx.table('pickItems').update(item.id, {
+                quantity: legacyBulk,
+                is_carton: true,
+                updated_at: now,
+              });
+            }
+
+            return tx.table('pickItems').update(item.id, {
+              quantity: legacyUnits,
+              is_carton: false,
+              updated_at: now,
+            });
+          }),
+        );
+      });
   }
 }
 

src/models/PickItem.ts

@@ -4,9 +4,12 @@ export interface PickItem {
   id: string;
   pick_list_id: string;
   product_id: string;
-  quantity_units: number;
-  quantity_bulk: number;
+  quantity: number;
+  is_carton: boolean;
   status: PickItemStatus;
   created_at: number;
   updated_at: number;
+  // Legacy fields retained for backward compatibility with pre-v5 data.
+  quantity_units?: number;
+  quantity_bulk?: number;
 }

src/screens/ActivePickListScreen.tsx

@@ -23,7 +23,7 @@ export const ActivePickListScreen = () => {
     const existing = await db.pickItems.get(itemId);
     if (!existing) return;
     await db.pickItems.update(itemId, {
-      quantity_units: existing.quantity_units + 1,
+      quantity: existing.quantity + 1,
       updated_at: Date.now(),
     });
   };
@@ -41,7 +41,7 @@ export const ActivePickListScreen = () => {
     await db.pickItems.update(itemId, { status: 'picked', updated_at: Date.now() });
   };
 
-  const handleSwipeRight = async (itemId: string) => {
+  const handleDeleteItem = async (itemId: string) => {
     await db.pickItems.delete(itemId);
   };
 

src/screens/AddItemScreen.tsx

@@ -26,26 +26,18 @@ export const AddItemScreen = () => {
   const [quantity, setQuantity] = useState(1);
   const [isCarton, setIsCarton] = useState(false);
   const navigate = useNavigate();
-
-  const existingProductIds = useMemo(
-    () => new Set(items.map((item) => item.product_id)),
-    [items],
-  );
-
-  const availableProducts = useMemo(
-    () => products.filter((product) => !existingProductIds.has(product.id)),
-    [existingProductIds, products],
-  );
+  const unitLabel = selectedProduct?.unit_type ?? 'Units';
+  const cartonLabel = selectedProduct?.bulk_name ?? 'Cartons';
 
   const filteredProducts = useMemo(() => {
     const normalizedQuery = query.trim().toLowerCase();
-    if (!normalizedQuery) return availableProducts;
+    if (!normalizedQuery) return products;
 
-    return availableProducts.filter((product) => {
+    return products.filter((product) => {
       const searchableText = `${product.name} ${product.category} ${product.barcode ?? ''}`.toLowerCase();
       return searchableText.includes(normalizedQuery);
     });
-  }, [availableProducts, query]);
+  }, [products, query]);
 
   useEffect(() => {
     if (!selectedProduct) return;
@@ -67,17 +59,35 @@ export const AddItemScreen = () => {
   const addItem = async () => {
     const productId = selectedProduct?.id;
 
-    if (!id || !productId || existingProductIds.has(productId)) return;
-    await db.pickItems.add({
-      id: uuidv4(),
-      pick_list_id: id,
-      product_id: productId,
-      quantity_units: quantity,
-      quantity_bulk: isCarton ? 1 : 0,
-      status: 'pending',
-      created_at: Date.now(),
-      updated_at: Date.now(),
-    });
+    if (!id || !productId) return;
+
+    const addOrUpdateItem = async (is_carton: boolean, quantity: number) => {
+      if (quantity <= 0) return;
+      const existing = items.find(
+        (item) => item.product_id === productId && item.is_carton === is_carton,
+      );
+
+      if (existing) {
+        await db.pickItems.update(existing.id, {
+          quantity: existing.quantity + quantity,
+          updated_at: Date.now(),
+        });
+        return;
+      }
+
+      await db.pickItems.add({
+        id: uuidv4(),
+        pick_list_id: id,
+        product_id: productId,
+        quantity,
+        is_carton,
+        status: 'pending',
+        created_at: Date.now(),
+        updated_at: Date.now(),
+      });
+    };
+
+    await Promise.all([addOrUpdateItem(false, units), addOrUpdateItem(true, bulk)]);
     navigate(`/pick-lists/${id}`);
   };
 
@@ -124,22 +134,8 @@ export const AddItemScreen = () => {
             />
           )}
         />
-        <TextField
-          label="Quantity"
-          type="number"
-          inputProps={{ min: 1 }}
-          value={quantity}
-          onChange={(event) => {
-            const value = Number(event.target.value);
-            setQuantity(Number.isNaN(value) || value < 1 ? 1 : value);
-          }}
-          helperText={quantityHelperText}
-          fullWidth
-        />
-        <FormControlLabel
-          control={<Checkbox checked={isCarton} onChange={(event) => setIsCarton(event.target.checked)} />}
-          label={cartonLabel}
-        />
+        <NumericStepper label={unitLabel} value={units} onChange={setUnits} />
+        <NumericStepper label={cartonLabel} value={bulk} onChange={setBulk} />
         <Button variant="contained" disabled={!selectedProduct} onClick={addItem}>
           Add to List
         </Button>