Commit 1d9925d9 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

[ngrams] don't show pending changes for input search query

parent 6d0e4a5e
...@@ -423,22 +423,24 @@ displayRow state@{ ngramsChildren ...@@ -423,22 +423,24 @@ displayRow state@{ ngramsChildren
ngramsParentRoot ngramsParentRoot
termListFilter termListFilter
(NgramsElement {ngrams, root, list}) = (NgramsElement {ngrams, root, list}) =
isNothing root (
-- ^ Display only nodes without parents isNothing root
&& maybe true (_ == list) termListFilter -- ^ Display only nodes without parents
-- ^ and which matches the ListType filter. && maybe true (_ == list) termListFilter
&& queryMatchesLabel searchQuery (ngramsTermText ngrams) -- ^ and which matches the ListType filter.
-- ^ and which matches the search query. && 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 -- ^ and which are not our new parent
-- ^ and which are not our new parent && Just ngrams /= ngramsParentRoot
&& Just ngrams /= ngramsParentRoot -- ^ and which are not the root of our new parent
-- ^ and which are not the root of our new parent || ngramsChildren ^. at ngrams == Just false
|| ngramsChildren ^. at ngrams == Just false -- ^ unless they are scheduled to be removed.
-- ^ unless they are scheduled to be removed. || NTC.tablePatchHasNgrams ngramsLocalPatch ngrams
|| NTC.tablePatchHasNgrams ngramsLocalPatch ngrams -- ^ unless they are being processed at the moment.
-- ^ unless they are being processed at the moment. )
&& queryMatchesLabel searchQuery (ngramsTermText ngrams)
-- ^ and which matches the search query.
allNgramsSelectedOnFirstPage :: Set NgramsTerm -> PreConversionRows -> Boolean allNgramsSelectedOnFirstPage :: Set NgramsTerm -> PreConversionRows -> Boolean
......
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