-
Notifications
You must be signed in to change notification settings - Fork 8
Search Resources in Dataset Read View Func #225
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
Open
JVickery-TBS
wants to merge
2
commits into
canada-v2.10
Choose a base branch
from
feature/resource-search
base: canada-v2.10
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+18
−0
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Added capability for the `dataset.read` view function to "search" a package's resources via the URI arg `resource_query`. It only searches by the resource names. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -8,6 +8,9 @@ | |||||||||||||||||||||||
| from typing_extensions import TypeAlias | ||||||||||||||||||||||||
| from urllib.parse import urlencode | ||||||||||||||||||||||||
| from typing import Any, Iterable, Optional, Union, cast | ||||||||||||||||||||||||
| # (canada fork only): resource search | ||||||||||||||||||||||||
| # TODO: upstream contrib?? | ||||||||||||||||||||||||
| from html import escape as html_escape | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| from flask import Blueprint | ||||||||||||||||||||||||
| from flask.views import MethodView | ||||||||||||||||||||||||
|
|
@@ -489,6 +492,20 @@ def read(package_type: str, id: str) -> Union[Response, str]: | |||||||||||||||||||||||
| return h.redirect_to(u'{}.read'.format(package_type), | ||||||||||||||||||||||||
| id=pkg_dict['name']) | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| # (canada fork only): resource search | ||||||||||||||||||||||||
| # TODO: upstream contrib?? | ||||||||||||||||||||||||
| resource_query = request.args.get("resource_query") | ||||||||||||||||||||||||
| if resource_query: | ||||||||||||||||||||||||
| resource_query = html_escape(resource_query) | ||||||||||||||||||||||||
| filtered_resources = [] | ||||||||||||||||||||||||
| for res_dict in pkg_dict['resources']: | ||||||||||||||||||||||||
| res_name = h.get_translated(res_dict, 'name') | ||||||||||||||||||||||||
| if resource_query.lower() not in res_name.lower(): | ||||||||||||||||||||||||
| continue | ||||||||||||||||||||||||
| filtered_resources.append(res_dict) | ||||||||||||||||||||||||
| pkg_dict['resources'] = filtered_resources | ||||||||||||||||||||||||
|
Comment on lines
+500
to
+506
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If you want to save some steps and temporary variables:
Suggested change
|
||||||||||||||||||||||||
| g.resource_query = resource_query | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
| # can the resources be previewed? | ||||||||||||||||||||||||
| for resource in pkg_dict[u'resources']: | ||||||||||||||||||||||||
| resource_views = get_action(u'resource_view_list')( | ||||||||||||||||||||||||
|
|
||||||||||||||||||||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This shouldn't be needed. Flask has already converted any url-encoded characters here and the resource name we're comparing against is not escaped.