vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix: added sorting and filtering logic for relevant input results

Browse source
This commit is contained in:
codescientist703 2021-06-23 13:13:51 +05:30
parent aa6520b5b0
commit 85bbcaaac4
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
frappe/desk/search.py
View file

@ -167,11 +167,20 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0,
as_list=not as_dict,
strict=False)
# Bring Parent doctype to top and child doctype below it using sorting
values = sorted(values, key=lambda x: ((x[1] is not None), (x[0])))
# Filtering the values array so that query is included in very element
values = tuple(
[
v for v in list(values)
if re.search(
re.escape(txt) + ".*", (_(v.name) if as_dict else _(v[0])), re.IGNORECASE
)
]
)
if doctype in UNTRANSLATED_DOCTYPES:
values = tuple([v for v in list(values) if re.search(re.escape(txt)+".*", (_(v.name) if as_dict else _(v[0])), re.IGNORECASE)])
# Sorting the values array so that relevant results always come first
# This will first bring elements on top in which query is a prefix of element
# Then it will bring the rest of the elements and sort them in lexicographical order
values = sorted(values, key=lambda x: sorting_comparator(x, txt, as_dict))
# remove _relevance from results
if as_dict:
@ -211,6 +220,13 @@ def scrub_custom_query(query, key, txt):
query = query.replace('%s', ((txt or '') + '%'))
return query
def sorting_comparator(key, query, as_dict):
value = (_(key.name) if as_dict else _(key[0]))
return (
value.lower().startswith(query.lower()) is False,
value
)
@wrapt.decorator
def validate_and_sanitize_search_inputs(fn, instance, args, kwargs):
kwargs.update(dict(zip(fn.__code__.co_varnames, args)))