Fix packaging filter availability logic

This commit is contained in:
beatz174-bit
2025-11-24 16:09:11 +10:00
parent af2dec1c40
commit a4dbe1679a
2 changed files with 99 additions and 10 deletions
+19 -10
View File
@@ -48,19 +48,22 @@ export const ActivePickListScreen = () => {
[itemState, showPicked],
);
const allItemsPicked = useMemo(
() => itemState.length > 0 && itemState.every((item) => item.status === 'picked'),
const hasPickedItemsInList = useMemo(
() => itemState.some((item) => item.status === 'picked'),
[itemState],
);
const hasUnpickedItems = useMemo(
() => itemsVisibleByStatus.some((item) => item.status !== 'picked'),
[itemsVisibleByStatus],
const hasUnpickedItemsInList = useMemo(
() => itemState.some((item) => item.status !== 'picked'),
[itemState],
);
const hasPickedItems = useMemo(
() => itemsVisibleByStatus.some((item) => item.status === 'picked'),
[itemsVisibleByStatus],
const allItemsPicked = useMemo(
() => itemState.length > 0 && !hasUnpickedItemsInList,
[hasUnpickedItemsInList, itemState.length],
);
const allItemsUnpicked = useMemo(
() => itemState.length > 0 && !hasPickedItemsInList,
[hasPickedItemsInList, itemState.length],
);
const hasMixedPickStatuses = hasPickedItems && hasUnpickedItems;
const productMap = useMemo(() => {
const map = new Map<string, Product>();
@@ -150,7 +153,7 @@ export const ActivePickListScreen = () => {
);
const packagingTypeCount = Number(hasCartonItems) + Number(hasUnitItems);
const singlePackagingType = packagingTypeCount === 1;
const packagingFiltersDisabled = !hasMixedPickStatuses;
const packagingFiltersDisabled = !showPicked || allItemsPicked || allItemsUnpicked;
const productIdsInList = useMemo(
() => new Set(itemState.map((item) => item.product_id)),
@@ -184,6 +187,12 @@ export const ActivePickListScreen = () => {
}
}, [allItemsPicked, showPicked]);
useEffect(() => {
if (packagingFiltersDisabled && itemFilter !== 'all') {
setItemFilter('all');
}
}, [itemFilter, packagingFiltersDisabled]);
useEffect(() => {
if (packagingTypeCount <= 1) {
if (itemFilter !== 'all') {