Merge pull request #8 from beatz174-bit/codex/add-page-for-editing-product-categories
Add category management screen
This commit is contained in:
@@ -9,6 +9,7 @@ import { ActivePickListScreen } from './screens/ActivePickListScreen';
|
|||||||
import { AddItemScreen } from './screens/AddItemScreen';
|
import { AddItemScreen } from './screens/AddItemScreen';
|
||||||
import { ManageProductsScreen } from './screens/ManageProductsScreen';
|
import { ManageProductsScreen } from './screens/ManageProductsScreen';
|
||||||
import { ManageAreasScreen } from './screens/ManageAreasScreen';
|
import { ManageAreasScreen } from './screens/ManageAreasScreen';
|
||||||
|
import { ManageCategoriesScreen } from './screens/ManageCategoriesScreen';
|
||||||
import { BarcodeScannerScreen } from './screens/BarcodeScannerScreen';
|
import { BarcodeScannerScreen } from './screens/BarcodeScannerScreen';
|
||||||
import { useServiceWorker } from './hooks/useServiceWorker';
|
import { useServiceWorker } from './hooks/useServiceWorker';
|
||||||
|
|
||||||
@@ -32,6 +33,7 @@ const AppRoutes = () => {
|
|||||||
<Route path="/pick-lists/:id" element={<ActivePickListScreen />} />
|
<Route path="/pick-lists/:id" element={<ActivePickListScreen />} />
|
||||||
<Route path="/pick-lists/:id/add-item" element={<AddItemScreen />} />
|
<Route path="/pick-lists/:id/add-item" element={<AddItemScreen />} />
|
||||||
<Route path="/products" element={<ManageProductsScreen />} />
|
<Route path="/products" element={<ManageProductsScreen />} />
|
||||||
|
<Route path="/categories" element={<ManageCategoriesScreen />} />
|
||||||
<Route path="/areas" element={<ManageAreasScreen />} />
|
<Route path="/areas" element={<ManageAreasScreen />} />
|
||||||
<Route path="/scan" element={<BarcodeScannerScreen />} />
|
<Route path="/scan" element={<BarcodeScannerScreen />} />
|
||||||
</Route>
|
</Route>
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ const navLinks = [
|
|||||||
{ to: '/start', label: 'Start' },
|
{ to: '/start', label: 'Start' },
|
||||||
{ to: '/pick-lists', label: 'Pick Lists' },
|
{ to: '/pick-lists', label: 'Pick Lists' },
|
||||||
{ to: '/products', label: 'Products' },
|
{ to: '/products', label: 'Products' },
|
||||||
|
{ to: '/categories', label: 'Categories' },
|
||||||
{ to: '/areas', label: 'Areas' },
|
{ to: '/areas', label: 'Areas' },
|
||||||
{ to: '/scan', label: 'Scan' },
|
{ to: '/scan', label: 'Scan' },
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
import Dexie, { Table } from 'dexie';
|
import Dexie, { Table } from 'dexie';
|
||||||
|
import { v4 as uuidv4 } from 'uuid';
|
||||||
import { Area } from '../models/Area';
|
import { Area } from '../models/Area';
|
||||||
|
import { Category } from '../models/Category';
|
||||||
import { PickItem } from '../models/PickItem';
|
import { PickItem } from '../models/PickItem';
|
||||||
import { PickList } from '../models/PickList';
|
import { PickList } from '../models/PickList';
|
||||||
import { Product } from '../models/Product';
|
import { Product } from '../models/Product';
|
||||||
@@ -11,6 +13,7 @@ export class StockFillDB extends Dexie {
|
|||||||
areas!: Table<Area>;
|
areas!: Table<Area>;
|
||||||
pickLists!: Table<PickList>;
|
pickLists!: Table<PickList>;
|
||||||
pickItems!: Table<PickItem>;
|
pickItems!: Table<PickItem>;
|
||||||
|
categories!: Table<Category>;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
super('stockfill');
|
super('stockfill');
|
||||||
@@ -21,6 +24,33 @@ export class StockFillDB extends Dexie {
|
|||||||
pickLists: 'id, area_id, created_at, completed_at',
|
pickLists: 'id, area_id, created_at, completed_at',
|
||||||
pickItems: 'id, pick_list_id, product_id, status, created_at, updated_at',
|
pickItems: 'id, pick_list_id, product_id, status, created_at, updated_at',
|
||||||
});
|
});
|
||||||
|
this.version(2)
|
||||||
|
.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, created_at, updated_at',
|
||||||
|
categories: 'id, name, created_at, updated_at',
|
||||||
|
})
|
||||||
|
.upgrade(async (tx) => {
|
||||||
|
const existingCategories = await tx.table('categories').count();
|
||||||
|
if (existingCategories > 0) return;
|
||||||
|
|
||||||
|
const products = await tx.table('products').toArray();
|
||||||
|
const uniqueCategories = Array.from(new Set(products.map((product) => product.category)));
|
||||||
|
if (uniqueCategories.length === 0) return;
|
||||||
|
|
||||||
|
const now = Date.now();
|
||||||
|
await tx.table('categories').bulkAdd(
|
||||||
|
uniqueCategories.map((name: string) => ({
|
||||||
|
id: uuidv4(),
|
||||||
|
name,
|
||||||
|
created_at: now,
|
||||||
|
updated_at: now,
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,16 @@ export const seedDatabase = async (db: StockFillDB) => {
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const categoryCount = await db.categories.count();
|
||||||
|
if (categoryCount === 0) {
|
||||||
|
await db.categories.bulkAdd([
|
||||||
|
{ id: uuidv4(), name: 'Drinks', created_at: now(), updated_at: now() },
|
||||||
|
{ id: uuidv4(), name: 'Snacks', created_at: now(), updated_at: now() },
|
||||||
|
{ id: uuidv4(), name: 'Dairy', created_at: now(), updated_at: now() },
|
||||||
|
{ id: uuidv4(), name: 'Confectionery', created_at: now(), updated_at: now() },
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
const productCount = await db.products.count();
|
const productCount = await db.products.count();
|
||||||
if (productCount === 0) {
|
if (productCount === 0) {
|
||||||
await db.products.bulkAdd([
|
await db.products.bulkAdd([
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { liveQuery } from 'dexie';
|
|||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
import { useDatabase } from '../context/DBProvider';
|
import { useDatabase } from '../context/DBProvider';
|
||||||
import { Area } from '../models/Area';
|
import { Area } from '../models/Area';
|
||||||
|
import { Category } from '../models/Category';
|
||||||
import { PickItem } from '../models/PickItem';
|
import { PickItem } from '../models/PickItem';
|
||||||
import { PickList } from '../models/PickList';
|
import { PickList } from '../models/PickList';
|
||||||
import { Product } from '../models/Product';
|
import { Product } from '../models/Product';
|
||||||
@@ -46,6 +47,19 @@ export const useAreas = () => {
|
|||||||
return areas;
|
return areas;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const useCategories = () => {
|
||||||
|
const db = useDatabase();
|
||||||
|
const [categories, setCategories] = useState<Category[]>([]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const subscription = liveQuery(() => db.categories.toArray()).subscribe({
|
||||||
|
next: setCategories,
|
||||||
|
});
|
||||||
|
return () => subscription.unsubscribe();
|
||||||
|
}, [db]);
|
||||||
|
return categories;
|
||||||
|
};
|
||||||
|
|
||||||
export const usePickLists = () => {
|
export const usePickLists = () => {
|
||||||
const db = useDatabase();
|
const db = useDatabase();
|
||||||
const [lists, setLists] = useState<PickList[]>([]);
|
const [lists, setLists] = useState<PickList[]>([]);
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
export interface Category {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
created_at: number;
|
||||||
|
updated_at: number;
|
||||||
|
}
|
||||||
@@ -0,0 +1,172 @@
|
|||||||
|
import {
|
||||||
|
Alert,
|
||||||
|
AlertColor,
|
||||||
|
Button,
|
||||||
|
Container,
|
||||||
|
IconButton,
|
||||||
|
List,
|
||||||
|
ListItem,
|
||||||
|
ListItemText,
|
||||||
|
Stack,
|
||||||
|
TextField,
|
||||||
|
Typography,
|
||||||
|
} from '@mui/material';
|
||||||
|
import CheckIcon from '@mui/icons-material/Check';
|
||||||
|
import CloseIcon from '@mui/icons-material/Close';
|
||||||
|
import DeleteIcon from '@mui/icons-material/Delete';
|
||||||
|
import EditIcon from '@mui/icons-material/Edit';
|
||||||
|
import { useMemo, useState } from 'react';
|
||||||
|
import { v4 as uuidv4 } from 'uuid';
|
||||||
|
import { useDatabase } from '../context/DBProvider';
|
||||||
|
import { useCategories, useProducts } from '../hooks/dataHooks';
|
||||||
|
|
||||||
|
export const ManageCategoriesScreen = () => {
|
||||||
|
const db = useDatabase();
|
||||||
|
const categories = useCategories();
|
||||||
|
const products = useProducts();
|
||||||
|
const [name, setName] = useState('');
|
||||||
|
const [editingCategoryId, setEditingCategoryId] = useState<string | null>(null);
|
||||||
|
const [editName, setEditName] = useState('');
|
||||||
|
const [feedback, setFeedback] = useState<{ text: string; severity: AlertColor } | null>(null);
|
||||||
|
|
||||||
|
const usageByCategory = useMemo(() => {
|
||||||
|
return products.reduce<Record<string, number>>((acc, product) => {
|
||||||
|
acc[product.category] = (acc[product.category] ?? 0) + 1;
|
||||||
|
return acc;
|
||||||
|
}, {});
|
||||||
|
}, [products]);
|
||||||
|
|
||||||
|
const addCategory = async () => {
|
||||||
|
const trimmed = name.trim();
|
||||||
|
if (!trimmed) return;
|
||||||
|
const exists = categories.some((category) => category.name.toLowerCase() === trimmed.toLowerCase());
|
||||||
|
if (exists) {
|
||||||
|
setFeedback({ text: 'A category with this name already exists.', severity: 'error' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await db.categories.add({ id: uuidv4(), name: trimmed, created_at: Date.now(), updated_at: Date.now() });
|
||||||
|
setName('');
|
||||||
|
setFeedback({ text: 'Category added.', severity: 'success' });
|
||||||
|
};
|
||||||
|
|
||||||
|
const startEditing = (categoryId: string, currentName: string) => {
|
||||||
|
setEditingCategoryId(categoryId);
|
||||||
|
setEditName(currentName);
|
||||||
|
setFeedback(null);
|
||||||
|
};
|
||||||
|
|
||||||
|
const saveCategory = async () => {
|
||||||
|
if (!editingCategoryId) return;
|
||||||
|
const trimmed = editName.trim();
|
||||||
|
if (!trimmed) return;
|
||||||
|
|
||||||
|
const category = categories.find((item) => item.id === editingCategoryId);
|
||||||
|
if (!category) return;
|
||||||
|
|
||||||
|
const nameExists = categories.some(
|
||||||
|
(item) => item.id !== editingCategoryId && item.name.toLowerCase() === trimmed.toLowerCase(),
|
||||||
|
);
|
||||||
|
if (nameExists) {
|
||||||
|
setFeedback({ text: 'A category with this name already exists.', severity: 'error' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await db.transaction('rw', db.categories, db.products, async () => {
|
||||||
|
await db.categories.update(editingCategoryId, { name: trimmed, updated_at: Date.now() });
|
||||||
|
await db.products
|
||||||
|
.where('category')
|
||||||
|
.equals(category.name)
|
||||||
|
.modify({ category: trimmed, updated_at: Date.now() });
|
||||||
|
});
|
||||||
|
|
||||||
|
setEditingCategoryId(null);
|
||||||
|
setEditName('');
|
||||||
|
setFeedback({ text: 'Category updated. Linked products were refreshed.', severity: 'success' });
|
||||||
|
};
|
||||||
|
|
||||||
|
const cancelEditing = () => {
|
||||||
|
setEditingCategoryId(null);
|
||||||
|
setEditName('');
|
||||||
|
setFeedback(null);
|
||||||
|
};
|
||||||
|
|
||||||
|
const deleteCategory = async (categoryId: string, categoryName: string) => {
|
||||||
|
const usageCount = usageByCategory[categoryName] ?? 0;
|
||||||
|
if (usageCount > 0) {
|
||||||
|
setFeedback({
|
||||||
|
text: `Cannot delete '${categoryName}' while ${usageCount} product(s) use it. Update those products first.`,
|
||||||
|
severity: 'error',
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await db.categories.delete(categoryId);
|
||||||
|
if (editingCategoryId === categoryId) {
|
||||||
|
cancelEditing();
|
||||||
|
}
|
||||||
|
setFeedback({ text: 'Category deleted.', severity: 'success' });
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Container sx={{ py: 4 }}>
|
||||||
|
<Typography variant="h5" gutterBottom>
|
||||||
|
Manage Categories
|
||||||
|
</Typography>
|
||||||
|
<Stack spacing={2}>
|
||||||
|
{feedback ? <Alert severity={feedback.severity}>{feedback.text}</Alert> : null}
|
||||||
|
<Stack direction="row" spacing={1}>
|
||||||
|
<TextField
|
||||||
|
fullWidth
|
||||||
|
label="Category name"
|
||||||
|
value={name}
|
||||||
|
onChange={(event) => setName(event.target.value)}
|
||||||
|
/>
|
||||||
|
<Button variant="contained" onClick={addCategory} disabled={!name.trim()}>
|
||||||
|
Add
|
||||||
|
</Button>
|
||||||
|
</Stack>
|
||||||
|
<List>
|
||||||
|
{categories.map((category) => (
|
||||||
|
<ListItem key={category.id} divider>
|
||||||
|
{editingCategoryId === category.id ? (
|
||||||
|
<Stack direction="row" alignItems="center" spacing={1} sx={{ width: '100%' }}>
|
||||||
|
<TextField
|
||||||
|
size="small"
|
||||||
|
fullWidth
|
||||||
|
value={editName}
|
||||||
|
onChange={(event) => setEditName(event.target.value)}
|
||||||
|
/>
|
||||||
|
<IconButton color="primary" onClick={saveCategory} disabled={!editName.trim()} aria-label="Save category">
|
||||||
|
<CheckIcon />
|
||||||
|
</IconButton>
|
||||||
|
<IconButton onClick={cancelEditing} aria-label="Cancel editing">
|
||||||
|
<CloseIcon />
|
||||||
|
</IconButton>
|
||||||
|
</Stack>
|
||||||
|
) : (
|
||||||
|
<Stack direction="row" alignItems="center" spacing={1} sx={{ width: '100%' }}>
|
||||||
|
<ListItemText primary={category.name} secondary={`Used by ${usageByCategory[category.name] ?? 0} product(s)`} />
|
||||||
|
<Stack direction="row" spacing={0.5}>
|
||||||
|
<IconButton
|
||||||
|
onClick={() => startEditing(category.id, category.name)}
|
||||||
|
aria-label={`Edit ${category.name}`}
|
||||||
|
size="small"
|
||||||
|
>
|
||||||
|
<EditIcon fontSize="small" />
|
||||||
|
</IconButton>
|
||||||
|
<IconButton
|
||||||
|
onClick={() => deleteCategory(category.id, category.name)}
|
||||||
|
aria-label={`Delete ${category.name}`}
|
||||||
|
size="small"
|
||||||
|
>
|
||||||
|
<DeleteIcon fontSize="small" />
|
||||||
|
</IconButton>
|
||||||
|
</Stack>
|
||||||
|
</Stack>
|
||||||
|
)}
|
||||||
|
</ListItem>
|
||||||
|
))}
|
||||||
|
</List>
|
||||||
|
</Stack>
|
||||||
|
</Container>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -8,24 +8,37 @@ import {
|
|||||||
InputAdornment,
|
InputAdornment,
|
||||||
} from '@mui/material';
|
} from '@mui/material';
|
||||||
import SearchIcon from '@mui/icons-material/Search';
|
import SearchIcon from '@mui/icons-material/Search';
|
||||||
import { useMemo, useState } from 'react';
|
import { Link as RouterLink } from 'react-router-dom';
|
||||||
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
import { v4 as uuidv4 } from 'uuid';
|
import { v4 as uuidv4 } from 'uuid';
|
||||||
import { ProductRow } from '../components/ProductRow';
|
import { ProductRow } from '../components/ProductRow';
|
||||||
import { useProducts } from '../hooks/dataHooks';
|
import { useCategories, useProducts } from '../hooks/dataHooks';
|
||||||
import { useDatabase } from '../context/DBProvider';
|
import { useDatabase } from '../context/DBProvider';
|
||||||
|
|
||||||
const categories = ['Drinks', 'Snacks', 'Dairy', 'Confectionery'];
|
|
||||||
|
|
||||||
export const ManageProductsScreen = () => {
|
export const ManageProductsScreen = () => {
|
||||||
const db = useDatabase();
|
const db = useDatabase();
|
||||||
const products = useProducts();
|
const products = useProducts();
|
||||||
|
const categories = useCategories();
|
||||||
const [search, setSearch] = useState('');
|
const [search, setSearch] = useState('');
|
||||||
const [name, setName] = useState('');
|
const [name, setName] = useState('');
|
||||||
const [category, setCategory] = useState(categories[0]);
|
const [category, setCategory] = useState('');
|
||||||
const [unitType, setUnitType] = useState('unit');
|
const [unitType, setUnitType] = useState('unit');
|
||||||
const [bulkName, setBulkName] = useState('case');
|
const [bulkName, setBulkName] = useState('case');
|
||||||
const [unitsPerBulk, setUnitsPerBulk] = useState(6);
|
const [unitsPerBulk, setUnitsPerBulk] = useState(6);
|
||||||
|
|
||||||
|
const categoryOptions = useMemo(() => {
|
||||||
|
const categoryNames = categories.map((item) => item.name);
|
||||||
|
const productCategories = products.map((product) => product.category);
|
||||||
|
return Array.from(new Set([...categoryNames, ...productCategories]));
|
||||||
|
}, [categories, products]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (categoryOptions.length === 0) return;
|
||||||
|
if (!categoryOptions.includes(category)) {
|
||||||
|
setCategory(categoryOptions[0]);
|
||||||
|
}
|
||||||
|
}, [category, categoryOptions]);
|
||||||
|
|
||||||
const filtered = useMemo(
|
const filtered = useMemo(
|
||||||
() =>
|
() =>
|
||||||
products.filter((p) =>
|
products.filter((p) =>
|
||||||
@@ -35,7 +48,7 @@ export const ManageProductsScreen = () => {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const addProduct = async () => {
|
const addProduct = async () => {
|
||||||
if (!name) return;
|
if (!name || !category) return;
|
||||||
await db.products.add({
|
await db.products.add({
|
||||||
id: uuidv4(),
|
id: uuidv4(),
|
||||||
name,
|
name,
|
||||||
@@ -73,6 +86,9 @@ export const ManageProductsScreen = () => {
|
|||||||
Manage Products
|
Manage Products
|
||||||
</Typography>
|
</Typography>
|
||||||
<Stack spacing={2}>
|
<Stack spacing={2}>
|
||||||
|
<Button component={RouterLink} to="/categories" variant="outlined" sx={{ alignSelf: 'flex-start' }}>
|
||||||
|
Edit Categories
|
||||||
|
</Button>
|
||||||
<TextField
|
<TextField
|
||||||
placeholder="Search"
|
placeholder="Search"
|
||||||
value={search}
|
value={search}
|
||||||
@@ -82,8 +98,14 @@ export const ManageProductsScreen = () => {
|
|||||||
<Stack spacing={1}>
|
<Stack spacing={1}>
|
||||||
<Typography variant="subtitle1">Add Product</Typography>
|
<Typography variant="subtitle1">Add Product</Typography>
|
||||||
<TextField label="Name" value={name} onChange={(event) => setName(event.target.value)} />
|
<TextField label="Name" value={name} onChange={(event) => setName(event.target.value)} />
|
||||||
<TextField select label="Category" value={category} onChange={(event) => setCategory(event.target.value)}>
|
<TextField
|
||||||
{categories.map((cat) => (
|
select
|
||||||
|
label="Category"
|
||||||
|
value={category}
|
||||||
|
onChange={(event) => setCategory(event.target.value)}
|
||||||
|
disabled={categoryOptions.length === 0}
|
||||||
|
>
|
||||||
|
{categoryOptions.map((cat) => (
|
||||||
<MenuItem key={cat} value={cat}>
|
<MenuItem key={cat} value={cat}>
|
||||||
{cat}
|
{cat}
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
@@ -97,7 +119,7 @@ export const ManageProductsScreen = () => {
|
|||||||
value={unitsPerBulk}
|
value={unitsPerBulk}
|
||||||
onChange={(event) => setUnitsPerBulk(Number(event.target.value))}
|
onChange={(event) => setUnitsPerBulk(Number(event.target.value))}
|
||||||
/>
|
/>
|
||||||
<Button variant="contained" onClick={addProduct} disabled={!name}>
|
<Button variant="contained" onClick={addProduct} disabled={!name || !category}>
|
||||||
Save Product
|
Save Product
|
||||||
</Button>
|
</Button>
|
||||||
</Stack>
|
</Stack>
|
||||||
@@ -105,7 +127,7 @@ export const ManageProductsScreen = () => {
|
|||||||
<ProductRow
|
<ProductRow
|
||||||
key={product.id}
|
key={product.id}
|
||||||
product={product}
|
product={product}
|
||||||
categories={categories}
|
categories={categoryOptions}
|
||||||
onSave={updateProduct}
|
onSave={updateProduct}
|
||||||
onDelete={deleteProduct}
|
onDelete={deleteProduct}
|
||||||
/>
|
/>
|
||||||
|
|||||||
Reference in New Issue
Block a user