Skip to content

Use refactored search adapter #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Mar 30, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5a6975b
Use refactored search adaptater for lists
maudetes Jan 6, 2022
dc5ce5e
Use api v2 for fulltext search on datasets dynamic search
maudetes Jan 6, 2022
c11f397
Add api v2 support in vue suggestor
maudetes Jan 14, 2022
53c6aa8
Merge branch 'master' into feat/use-refactored-search-adapter
maudetes Jan 26, 2022
ee5077f
Use search endpoint instead of suggest in suggest box
maudetes Jan 26, 2022
04ac007
Revert apiv2 for suggest
maudetes Feb 2, 2022
8518655
Resources are now object hateoas on apiv2
maudetes Feb 2, 2022
80d4c9e
Use apiv2 search in suggest
maudetes Feb 2, 2022
fc23f63
Change suggest cards props following api change
maudetes Feb 15, 2022
411202b
Merge branch 'master' into feat/use-refactored-search-adapter
maudetes Feb 25, 2022
bf60daf
Update suggest cards with available metadata
maudetes Feb 28, 2022
3fc5095
Merge branch 'master' into feat/use-refactored-search-adapter
maudetes Mar 28, 2022
540ac66
Drop topic_search_for in topic views
maudetes Mar 28, 2022
32e6b6e
Use resources object with correct marshalling
maudetes Mar 28, 2022
d8102f3
Update changelog
maudetes Mar 28, 2022
6394146
Remove autoindex and list pages tests
maudetes Mar 28, 2022
859863a
Use mongo list for csv catalog views
maudetes Mar 28, 2022
948c3d0
Update pip requirements
maudetes Mar 29, 2022
c006251
Update pip requirements in python3.7
maudetes Mar 29, 2022
e67a9e6
more struggle with pip requirements in python3.7
maudetes Mar 29, 2022
e1b4efc
Hope this is the last pip requirement update
maudetes Mar 29, 2022
c8fc638
One more time
maudetes Mar 29, 2022
3e8ae6a
One more time
maudetes Mar 29, 2022
4ae0f2e
Remove dataset list page test
maudetes Mar 29, 2022
239399e
Merge branch 'master' into feat/use-refactored-search-adapter
maudetes Mar 29, 2022
0fb246d
Use udata master
maudetes Mar 29, 2022
6399666
update udata.pip requirement to udata
maudetes Mar 30, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Use refactored search adaptater for lists
  • Loading branch information
maudetes committed Jan 6, 2022
commit 5a6975ba364a7fc63ebfdf67d14b94f2cd25240c
9 changes: 2 additions & 7 deletions udata_front/views/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,8 @@ class SearchView(Templated, BaseView):
search_adapter = None

def get_queryset(self):
adapter = search.adapter_for(self.search_adapter or self.model)
parser = adapter.as_request_parser()
params = not_none_dict(parser.parse_args())
params['facets'] = True
adapter = self.search_adapter or self.model
result = search.query(adapter, **params)
return result
parser = self.search_adapter.as_request_parser()
return search.query(self.search_adapter, **not_none_dict(parser.parse_args()))

def get_context(self):
context = super(SearchView, self).get_context()
Expand Down
2 changes: 2 additions & 0 deletions udata_front/views/organization.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from udata.core.organization.permissions import (
EditOrganizationPermission, OrganizationPrivatePermission
)
from udata.core.organization.search import OrganizationSearch


blueprint = I18nBlueprint('organizations', __name__,
Expand All @@ -36,6 +37,7 @@ class OrganizationListView(SearchView):
model = Organization
context_name = 'organizations'
template_name = 'organization/list.html'
search_adapter = OrganizationSearch


class OrgView(object):
Expand Down
2 changes: 2 additions & 0 deletions udata_front/views/reuse.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

from udata.core.reuse.models import Reuse
from udata.core.reuse.permissions import ReuseEditPermission
from udata.core.reuse.search import ReuseSearch

blueprint = I18nBlueprint('reuses', __name__, url_prefix='/reuses')

Expand Down Expand Up @@ -48,6 +49,7 @@ class ReuseListView(SearchView):
model = Reuse
context_name = 'reuses'
template_name = 'reuse/list.html'
search_adapter = ReuseSearch


navbar = nav.Bar('edit_reuse', [
Expand Down