Skip to content
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

Hide Filters and Groups #558

Merged
merged 16 commits into from Nov 25, 2020
Merged

Hide Filters and Groups #558

merged 16 commits into from Nov 25, 2020

Conversation

michielderoos
Copy link
Contributor

Describe the Pull Request

Adds backend ability to hide filters and groups.
This is the first in a series, as we still need:

  • a UI
  • group-by tx/rx

Todo

  • Link relevant trello card or related issue to the pull request
  • Request review from relevant @person or team
  • QA your pull request. This includes running the app, login, testing changes etc.
  • Bump backend and/or frontend versions following Semver

@codecov
Copy link

codecov bot commented Nov 23, 2020

Codecov Report

Merging #558 (19281d8) into master (98f590e) will decrease coverage by 0.03%.
The diff coverage is 36.73%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #558      +/-   ##
==========================================
- Coverage   47.38%   47.35%   -0.04%     
==========================================
  Files         337      337              
  Lines       17240    17265      +25     
  Branches     1345     1284      -61     
==========================================
+ Hits         8170     8175       +5     
- Misses       9037     9075      +38     
+ Partials       33       15      -18     
Flag Coverage Δ
javascript 5.44% <0.00%> (-0.02%) ⬇️
python 71.07% <69.23%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
app/client/components/filterModule/filter.jsx 0.00% <0.00%> (ø)
app/server/api/metrics_api.py 96.22% <ø> (ø)
app/server/models/custom_attribute_user_storage.py 100.00% <ø> (+11.11%) ⬆️
app/server/utils/transfer_filter.py 85.14% <28.57%> (-1.59%) ⬇️
app/server/utils/metrics/group.py 95.91% <75.00%> (+0.08%) ⬆️
app/server/models/custom_attribute.py 93.54% <85.71%> (-6.46%) ⬇️
config.py 82.50% <100.00%> (ø)
app/server/__init__.py 92.20% <0.00%> (-0.46%) ⬇️
app/client/reducers/auth/reducers.ts 0.00% <0.00%> (ø)
app/client/reducers/user/reducers.ts 0.00% <0.00%> (ø)
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 98f590e...19281d8. Read the comment docs.

* master:
  Recipients filter (#533)
  Dynamic transfer card loaded (#559)

# Conflicts:
#	app/server/utils/transfer_filter.py
#	config.py
Copy link
Contributor

@enjeyw enjeyw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Ready to merge if ur happy with my tweak that does grouping of the select :)

Copy link
Contributor Author

@michielderoos michielderoos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Partition code looks great @enjeyw! Merging

@michielderoos michielderoos merged commit 842ef88 into master Nov 25, 2020
@michielderoos michielderoos deleted the hide-filters-and-groups branch November 25, 2020 12:43
enjeyw added a commit that referenced this pull request Nov 30, 2020
* master:
  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)
  multi-line notes (#556)
  Add indexes to eth_worker database (#545)
  Changes to custom attributes (#540)
  Rewrite custom attribute filters (#552)
@michielderoos michielderoos mentioned this pull request Dec 2, 2020
4 tasks
enjeyw added a commit that referenced this pull request Dec 3, 2020
* master:
  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)
  multi-line notes (#556)
  Add indexes to eth_worker database (#545)

# Conflicts:
#	config.py
enjeyw added a commit that referenced this pull request Dec 3, 2020
* master:
  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)
  multi-line notes (#556)
  Add indexes to eth_worker database (#545)
  Changes to custom attributes (#540)
  Rewrite custom attribute filters (#552)
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants