Commit 15adf4ae authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski Committed by Alexandre Delanoë

[ngrams] fix displayRow filtering

We want to show pending changes always.
parent ca1d6f48
...@@ -543,13 +543,12 @@ displayRow state@{ ngramsChildren ...@@ -543,13 +543,12 @@ displayRow state@{ ngramsChildren
ngramsParentRoot ngramsParentRoot
termListFilter termListFilter
(NgramsElement {ngrams, root, list}) = (NgramsElement {ngrams, root, list}) =
maybe true (_ == list) termListFilter isNothing root
-- ^ Display only nodes without parents
&& maybe true (_ == list) termListFilter
-- ^ and which matches the ListType filter. -- ^ and which matches the ListType filter.
&& queryMatchesLabel searchQuery (ngramsTermText ngrams) && queryMatchesLabel searchQuery (ngramsTermText ngrams)
-- ^ and which matches the search query. -- ^ and which matches the search query.
&& (
isNothing root
-- ^ Display only nodes without parents
&& ngramsChildren ^. at ngrams /= Just true && ngramsChildren ^. at ngrams /= Just true
-- ^ and which are not scheduled to be added already -- ^ and which are not scheduled to be added already
&& Just ngrams /= ngramsParent && Just ngrams /= ngramsParent
...@@ -560,7 +559,7 @@ displayRow state@{ ngramsChildren ...@@ -560,7 +559,7 @@ displayRow state@{ ngramsChildren
-- ^ unless they are scheduled to be removed. -- ^ unless they are scheduled to be removed.
|| tablePatchHasNgrams ngramsLocalPatch ngrams || tablePatchHasNgrams ngramsLocalPatch ngrams
-- ^ unless they are being processed at the moment. -- ^ unless they are being processed at the moment.
)
type MainNgramsTableProps = type MainNgramsTableProps =
( nodeId :: Int ( nodeId :: Int
......
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