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

Adding option to restore excluded pubs #434

Merged
merged 2 commits into from
Sep 14, 2018

Conversation

ryanml
Copy link
Contributor

@ryanml ryanml commented Sep 11, 2018

Fixes: brave/brave-browser#936

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Needed or QA/No-QA-Needed) to include the closed issue in milestone

Test Plan:

  1. Build Brave from this branch, and start with a clean profile
  2. Enable rewards
  3. Visit 7 - 10 sites so that they get added to the contribution table
  4. Exclude some sites.
  5. Hit the Restore action under the modal title
  6. Ensure the excluded sites are restored.
  7. Ensure that those sites can be re-excluded then restored.

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@ryanml ryanml changed the title WIP: Adding option to restore excluded pubs Adding option to restore excluded pubs Sep 13, 2018
@jasonrsadler
Copy link
Contributor

Can you squash commits?

@ryanml
Copy link
Contributor Author

ryanml commented Sep 13, 2018

@jasonrsadler - I can, but the additional commit was an existing issue within the publisher db logic and I wanted to leave it up for visibility. Let me know what you think, thanks!

@jasonrsadler
Copy link
Contributor

No prob. Was going off check off list up top. Leave as is. 👍

@jasonrsadler
Copy link
Contributor

Is the text coming later or should it already be there?

screen shot 2018-09-13 at 5 38 31 pm

@jasonrsadler
Copy link
Contributor

Do we plan to allow excluding if we have less than 6 publishers? Also, how do we unexclude if we remove publishers to having less than 6. Is that all addressed on a separate issue?

@ryanml
Copy link
Contributor Author

ryanml commented Sep 13, 2018

@jasonrsadler I may have to address this issue in brave-ui, as only the modal has UX for the restore button

@ryanml
Copy link
Contributor Author

ryanml commented Sep 13, 2018

@jasonrsadler locales added in to core

screen shot 2018-09-13 at 3 32 34 pm

Copy link
Contributor

@jasonrsadler jasonrsadler left a comment

Choose a reason for hiding this comment

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

Removing a youtube publisher crashes Brave.

@ryanml
Copy link
Contributor Author

ryanml commented Sep 14, 2018

@jasonrsadler media publishers should be removable now

Copy link
Contributor

@jasonrsadler jasonrsadler left a comment

Choose a reason for hiding this comment

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

!! ++ Works very good! Good job!

@jasonrsadler jasonrsadler merged commit 3bdda03 into brave:master Sep 14, 2018
@jasonrsadler
Copy link
Contributor

jasonrsadler commented Sep 14, 2018

bbondy pushed a commit that referenced this pull request Sep 14, 2018
Adding option to restore excluded pubs
@bbondy
Copy link
Member

bbondy commented Sep 14, 2018

Added label merged/0.55.x
Reverted 5630677 because no issue reference and bad commit message.

0.55.x revert f55ad6e
0.55.x 362008a
master 3bdda03

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.

Restore deleted sites
5 participants