Commit 2f2b168c authored by Darrick Yong's avatar Darrick Yong

fix filter bug

parent 6527d4a3
...@@ -45,7 +45,12 @@ const Filter = ({ orders, filtersOn, setFiltersOn, setOrdersToShow }) => { ...@@ -45,7 +45,12 @@ const Filter = ({ orders, filtersOn, setFiltersOn, setOrdersToShow }) => {
}; };
useEffect(() => { useEffect(() => {
if (all || (!all && !received && !fulfilled && !cancelled)) { if (!filtersOn) {
setAll(false);
setReceived(false);
setFulfilled(false);
setCancelled(false);
} else if (all || (!all && !received && !fulfilled && !cancelled)) {
setOrdersToShow(orders); setOrdersToShow(orders);
} else { } else {
const newOrders = { allIds: [], byId: {} }; const newOrders = { allIds: [], byId: {} };
...@@ -76,7 +81,7 @@ const Filter = ({ orders, filtersOn, setFiltersOn, setOrdersToShow }) => { ...@@ -76,7 +81,7 @@ const Filter = ({ orders, filtersOn, setFiltersOn, setOrdersToShow }) => {
}); });
setOrdersToShow(newOrders); setOrdersToShow(newOrders);
} }
}, [orders, setOrdersToShow, all, received, fulfilled, cancelled]); }, [orders, setOrdersToShow, filtersOn, all, received, fulfilled, cancelled]);
if (!orders.allIds.length) return null; if (!orders.allIds.length) return null;
...@@ -86,22 +91,22 @@ const Filter = ({ orders, filtersOn, setFiltersOn, setOrdersToShow }) => { ...@@ -86,22 +91,22 @@ const Filter = ({ orders, filtersOn, setFiltersOn, setOrdersToShow }) => {
<div className="filter-btns"> <div className="filter-btns">
<Button <Button
className={`filter-all ${filtersOn && all ? "selected" : ""}`} className={`filter-all ${all ? "selected" : ""}`}
onClick={reset} onClick={reset}
text="All" text="All"
/> />
<Button <Button
className={`filter-rec ${filtersOn && received ? "selected" : ""}`} className={`filter-rec ${received ? "selected" : ""}`}
onClick={receive} onClick={receive}
text="Received" text="Received"
/> />
<Button <Button
className={`filter-ful ${filtersOn && fulfilled ? "selected" : ""}`} className={`filter-ful ${fulfilled ? "selected" : ""}`}
onClick={fulfill} onClick={fulfill}
text="Fulfilled" text="Fulfilled"
/> />
<Button <Button
className={`filter-can ${filtersOn && cancelled ? "selected" : ""}`} className={`filter-can ${cancelled ? "selected" : ""}`}
onClick={cancel} onClick={cancel}
text="Cancelled" text="Cancelled"
/> />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment