Draft the My Trait Library widget #475
Open
Conversation
This file contains 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
- Actually add the species filter to the `query` - Make sure `tags` is defined before trying to take length
Instead of splitting on dataset ('caendr' and 'zhang'), there are now two endpoints for different return formats: SQL-style pagination and JS DataTable-style pagination.
Both endpoints accept a `dataset` URL var that filters the query to that dataset.
Split into `public`, `private`, and `all` endpoints, all handled by the same view functions. Roughly, these control whether the server should include private traits in the response, and require different levels of permission: - `public`: Queries traits that have been submitted to the public phenotype database. - `private`: Queries all traits that belong to the requesting user. Log-in required. - `all`: Queries all traits that have been uploaded. Admin users only.
Accepts argument `include_private`, which will determine whether private (unpublished) traits should be available to the query or not. For now, this argument doesn't do anything.
Still TODO: - Use trait_utils where relevant in My Trait Library code - Use display name(s) in My Trait Library
Moves display name logic to that file, so calling files don't have to worry about three-part name structure
Primarily brings `trait_id` table column into this branch. Still have to propagate this to all areas, e.g. selecting a trait in the table using `trait_id` instead of `trait_name_caendr`
Using the unique `trait_id` is cleaner
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Comment on lines
+239
to
+251
| return { | ||
| 'data': [ | ||
| tr.to_json() for tr in pagination.items | ||
| ], | ||
| 'pagination': { | ||
| 'has_next': pagination.has_next, | ||
| 'has_prev': pagination.has_prev, | ||
| 'prev_num': pagination.prev_num, | ||
| 'next_num': pagination.next_num, | ||
| 'total_pages': pagination.pages, | ||
| 'current_page': current_page | ||
| }, | ||
| } |
Check warning
Code scanning / CodeQL
Reflected server-side cross-site scripting Medium
There was a problem hiding this comment.
Values are cleaned using bleach in the helper function get_clean.
Comment on lines
+352
to
+359
| return { | ||
| 'data': [ | ||
| trait.to_json_with_values() for trait in data | ||
| ], | ||
| 'draw': draw, | ||
| 'recordsTotal': total_records, | ||
| 'recordsFiltered': filtered_records, | ||
| } |
Check warning
Code scanning / CodeQL
Reflected server-side cross-site scripting Medium
There was a problem hiding this comment.
Values are cleaned using bleach in the helper function get_clean.
A number of endpoints (i.e. tool submissions) have a standard set of error fields they might return, so this pulls that all together. Also means tool submissions now scroll to the top when an error message appears, which is nice.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
(Would prefer to merge #472 into dev and handle conflicts in this branch)