Group by Sender and Recipient #567
Merged
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
Codecov Report
@@ Coverage Diff @@
## master #567 +/- ##
==========================================
+ Coverage 47.24% 47.27% +0.03%
==========================================
Files 338 338
Lines 17527 17560 +33
Branches 1335 1345 +10
==========================================
+ Hits 8280 8302 +22
- Misses 9214 9225 +11
Partials 33 33
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
tristanhcole
requested changes
Dec 2, 2020
Comment on lines
147
to
163
| <OptGroup label={"Sender"}> | ||
| {senderGroups.map(group => { | ||
| return ( | ||
| <Option key={group}>{allowedGroups[group]["name"]}</Option> | ||
| ); | ||
| })} | ||
| </OptGroup> | ||
| } | ||
| if(recipientGroups) | ||
| { | ||
| <OptGroup label={"Recipient"}> | ||
| {recipientGroups.map(group => { | ||
| return ( | ||
| <Option key={key}> | ||
| {toTitleCase(replaceUnderscores(key))} | ||
| </Option> | ||
| <Option key={group}>{allowedGroups[group]["name"]}</Option> | ||
| ); | ||
| }) | ||
| : null} | ||
| })} | ||
| </OptGroup> |
There was a problem hiding this comment.
Taking a hint out of @enjeyw OptGroup PR, can we add showing the group name once selected. See example from filter.jsx
let subList = keys.map(key => {
//Here we show the label without the group in the dropdown, but with the group once selected
let label = replaceUnderscores(possibleFilters[key]["name"] || key);
return (
<Option key={key} label={label}>
{label.replace(userGroup, "")}
</Option>
);
});
| @@ -49,7 +69,11 @@ def build_query_group_by_with_join(self, query, query_object_model): | |||
| args = (grouped_query, self.custom_attribute_field_name) | |||
| else: | |||
| args = (grouped_query,) | |||
| return group_joining_strategies[query_object_model.__tablename__][self.group_object_model.__tablename__](*args) | |||
| if self.sender_or_recipient == 'recipient': | |||
There was a problem hiding this comment.
self.sender_or_recipient == 'recipient':
sorry coming into this code without context but this seems strange?
There was a problem hiding this comment.
Context for this change is here, this is just extending the feature to groups from an existing feature for filters.
enjeyw
added a commit
that referenced
this pull request
Dec 7, 2020
* master: feat: small improvements to accessibility across the web app (#562) Group by Sender and Recipient (#567) Enable multiple chains (#496) Silence loading spinner warning (#568) Custom attribute bugfix (#549) Antify Message Bar (#566) # Conflicts: # config.py # eth_worker/eth_src/celery_app.py # eth_worker/eth_src/sql_persistence/interface.py
enjeyw
added a commit
that referenced
this pull request
Dec 15, 2020
* master: (28 commits) Adding blockchain_task_uuid index to worker messages (#551) Make location lookup look at existing users' coordinates as a last resort (#555) Add support for Commcare (#569) Improve external transaction detection (#570) Remove unused imports (#571) Celo integration (#535) feat: small improvements to accessibility across the web app (#562) Group by Sender and Recipient (#567) Enable multiple chains (#496) Silence loading spinner warning (#568) Custom attribute bugfix (#549) Antify Message Bar (#566) Stop retrying infinitely (#565) Only update BlockchainTransaction on the worker when we absolutely have to (#564) Make SynchronizedBlock be updated in batch instead of one giant update (#563) Hide Filters and Groups (#558) adding more colors to charts, and tweaking legends (#561) Chart Tweaks (#560) Recipients filter (#533) Dynamic transfer card loaded (#559) ... # Conflicts: # app/server/api/transfer_card_api.py # app/test_app/functional/api/test_transfer_card_api.py
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.
Describe the Pull Request
Adds ability to group by sender and recipient! Also adds ability to hide them!
Todo