Merge pull request #127 from beatz174-bit/codex/fix-packaging-type-filter-functionality

Fix packaging filter availability logic
This commit is contained in:
beatz174-bit authored and GitHub committed 2025-11-24 16:09:31 +10:00
commit b1e8fc797a
2 files changed
+99 -10

No files matched your search

+19 -10
View File
@@ -50,19 +50,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>();
@@ -163,7 +166,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)),
@@ -197,6 +200,12 @@ export const ActivePickListScreen = () => {
}
}, [allItemsPicked, showPicked]);
useEffect(() => {
if (packagingFiltersDisabled && itemFilter !== 'all') {
setItemFilter('all');
}
}, [itemFilter, packagingFiltersDisabled]);
useEffect(() => {
if (packagingTypeCount <= 1) {
if (itemFilter !== 'all') {