Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
warehouse-management
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ascend
warehouse-management
Commits
2f2b168c
Commit
2f2b168c
authored
May 10, 2021
by
Darrick Yong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix filter bug
parent
6527d4a3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
6 deletions
+11
-6
Filter.jsx
frontend/src/components/filter/Filter.jsx
+11
-6
No files found.
frontend/src/components/filter/Filter.jsx
View file @
2f2b168c
...
...
@@ -45,7 +45,12 @@ const Filter = ({ orders, filtersOn, setFiltersOn, setOrdersToShow }) => {
};
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
);
}
else
{
const
newOrders
=
{
allIds
:
[],
byId
:
{}
};
...
...
@@ -76,7 +81,7 @@ const Filter = ({ orders, filtersOn, setFiltersOn, setOrdersToShow }) => {
});
setOrdersToShow
(
newOrders
);
}
},
[
orders
,
setOrdersToShow
,
all
,
received
,
fulfilled
,
cancelled
]);
},
[
orders
,
setOrdersToShow
,
filtersOn
,
all
,
received
,
fulfilled
,
cancelled
]);
if
(
!
orders
.
allIds
.
length
)
return
null
;
...
...
@@ -86,22 +91,22 @@ const Filter = ({ orders, filtersOn, setFiltersOn, setOrdersToShow }) => {
<
div
className=
"filter-btns"
>
<
Button
className=
{
`filter-all ${
filtersOn &&
all ? "selected" : ""}`
}
className=
{
`filter-all ${all ? "selected" : ""}`
}
onClick=
{
reset
}
text=
"All"
/>
<
Button
className=
{
`filter-rec ${
filtersOn &&
received ? "selected" : ""}`
}
className=
{
`filter-rec ${received ? "selected" : ""}`
}
onClick=
{
receive
}
text=
"Received"
/>
<
Button
className=
{
`filter-ful ${f
iltersOn && f
ulfilled ? "selected" : ""}`
}
className=
{
`filter-ful ${fulfilled ? "selected" : ""}`
}
onClick=
{
fulfill
}
text=
"Fulfilled"
/>
<
Button
className=
{
`filter-can ${
filtersOn &&
cancelled ? "selected" : ""}`
}
className=
{
`filter-can ${cancelled ? "selected" : ""}`
}
onClick=
{
cancel
}
text=
"Cancelled"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment