Adjust packaging filter when only one type

This commit is contained in:
beatz174-bit
2025-11-23 16:16:40 +10:00
parent a1f80e2554
commit 0cf759d540
2 changed files with 21 additions and 9 deletions
+4 -2
View File
@@ -355,8 +355,9 @@ describe('ActivePickListScreen product search', () => {
</MemoryRouter>,
);
expect(screen.getByRole('radio', { name: /all/i })).toBeChecked();
expect(screen.getByRole('radio', { name: /cartons/i })).toBeDisabled();
expect(screen.getByRole('radio', { name: /units/i })).toBeEnabled();
expect(screen.getByRole('radio', { name: /units/i })).toBeDisabled();
});
it('resets the filter when the selected packaging type is unavailable', async () => {
@@ -418,7 +419,8 @@ describe('ActivePickListScreen product search', () => {
);
await waitFor(() => expect(screen.getByRole('radio', { name: /cartons/i })).toBeDisabled());
expect(screen.getByRole('radio', { name: /units/i })).toBeChecked();
expect(screen.getByRole('radio', { name: /all/i })).toBeChecked();
expect(screen.getByRole('radio', { name: /units/i })).toBeDisabled();
});
it('hides picked items when show picked is unchecked', async () => {
+17 -7
View File
@@ -100,6 +100,8 @@ export const ActivePickListScreen = () => {
const hasCartonItems = useMemo(() => items.some((item) => item.is_carton), [items]);
const hasUnitItems = useMemo(() => items.some((item) => !item.is_carton), [items]);
const packagingTypeCount = Number(hasCartonItems) + Number(hasUnitItems);
const singlePackagingType = packagingTypeCount === 1;
const filteredProducts = useMemo(() => {
const normalizedQuery = query.trim().toLowerCase();
@@ -125,12 +127,20 @@ export const ActivePickListScreen = () => {
}, [allItemsPicked, showPicked]);
useEffect(() => {
if (itemFilter === 'cartons' && !hasCartonItems) {
setItemFilter(hasUnitItems ? 'units' : 'all');
} else if (itemFilter === 'units' && !hasUnitItems) {
setItemFilter(hasCartonItems ? 'cartons' : 'all');
if (packagingTypeCount <= 1) {
if (itemFilter !== 'all') {
setItemFilter('all');
}
return;
}
}, [itemFilter, hasCartonItems, hasUnitItems]);
if (itemFilter === 'cartons' && !hasCartonItems) {
setItemFilter('units');
} else if (itemFilter === 'units' && !hasUnitItems) {
setItemFilter('cartons');
}
}, [itemFilter, hasCartonItems, hasUnitItems, packagingTypeCount]);
const visibleItems = useMemo(() => {
let filteredItems = showPicked
@@ -326,13 +336,13 @@ export const ActivePickListScreen = () => {
value="cartons"
control={<Radio />}
label="Cartons"
disabled={!hasCartonItems}
disabled={singlePackagingType || !hasCartonItems}
/>
<FormControlLabel
value="units"
control={<Radio />}
label="Units"
disabled={!hasUnitItems}
disabled={singlePackagingType || !hasUnitItems}
/>
</RadioGroup>
<Stack direction="row" spacing={1} alignItems="center" sx={{ ml: { xs: 0, sm: 2 } }}>