Skip to content

Issue/13268 activity log filters visibility#13721

Merged
malinajirka merged 11 commits intodevelopfrom
issue/13268-activity-log-filters-visibility
Jan 7, 2021
Merged

Issue/13268 activity log filters visibility#13721
malinajirka merged 11 commits intodevelopfrom
issue/13268-activity-log-filters-visibility

Conversation

@malinajirka
Copy link
Copy Markdown
Contributor

Parent issue #13268

Merge instructions:

  1. Make sure Introduce fetch jetpack capabilities endpoint WordPress-FluxC-Android#1825 is merged
  2. Update FluxC hash with tag
  3. Remove "Not ready for merge" label
  4. Merge this PR

This PR hides the filters bar in Activity Log if

  • the user is on a free plan and hasn't purchased any jetpack product
  • the user is on paid plan

"Fetch Jetpack Capabilities" endpoint is used to fetch list of product the user has purchased.

To test:
Perform the following test on multiple sites, ideally on

  • .com free (hidden)
  • .com paid (visible)
  • .com atomic (visible)
  • .jetpack free (hidden)
  • .jetpack paid (visible)
  • .jetpack free with backup product (visible)
  1. Make sure "ActivityLogFiltersFeatureConfig" is enabled
  2. Open Activity log and check visibility of the filters bar

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

@peril-wordpress-mobile
Copy link
Copy Markdown

peril-wordpress-mobile bot commented Jan 7, 2021

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@peril-wordpress-mobile
Copy link
Copy Markdown

peril-wordpress-mobile bot commented Jan 7, 2021

You can test the changes on this Pull Request by downloading the APK here.

@malinajirka malinajirka requested review from zwarm and removed request for ashiagr January 7, 2021 13:57
@malinajirka malinajirka assigned zwarm and unassigned ashiagr Jan 7, 2021
@malinajirka malinajirka mentioned this pull request Jan 7, 2021
31 tasks
Copy link
Copy Markdown
Contributor

@zwarm zwarm left a comment

Choose a reason for hiding this comment

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

All scenarios have been tested and the activity filter visibility works as expected. Tested in conjunction with the FluxC PR. Nicely done!

@malinajirka malinajirka merged commit 4963e82 into develop Jan 7, 2021
@malinajirka malinajirka deleted the issue/13268-activity-log-filters-visibility branch January 7, 2021 16:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants