Add support for multiple views on Shields #2874
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
cezaraugusto
force-pushed
the
ca-1196
branch
4 times, most recently
from
b5772d8
to
50f01c1
Compare
cezaraugusto
requested review from
Snuupy,
yrliou,
karenkliu,
tildelowengrimm,
petemill and
bsclifton
karenkliu
reviewed
Jul 8, 2019
There was a problem hiding this comment.
Hi @cezaraugusto! This looks good, but I was wondering if there was any way we could fit in these last minute small changes to this PR:
If not, could we please get this in for the next build?
close brave/brave-browser#4953 Shields state needed across windows/tabs is not stored in localStorage API. This follows the webUI convention for persistent state. Goal is to provide a way to handle upcoming changes such as onboarding screen and simple/advanced view setting. Other state such as stats, resources blocked, and blocking preferences are still handled by the back-end and are left untouched.
|
@karenkliu updated |
petemill
reviewed
Jul 10, 2019
| @@ -121,7 +121,7 @@ describe('cosmeticFilterReducer', () => { | |||
| shieldsPanelReducer(initialState.shieldsPanel, { | |||
| type: windowTypes.WINDOW_REMOVED, | |||
| windowId | |||
| }) | |||
| }) | |||
petemill
reviewed
Jul 10, 2019
| @@ -196,6 +226,9 @@ describe('shieldsPanelState test', () => { | |||
| it('updates the currentWindowId', () => { | |||
| expect(shieldsPanelState.updateFocusedWindow(state, 2)).toEqual({ | |||
| currentWindowId: 2, | |||
| persistentData: { | |||
There was a problem hiding this comment.
nit: this all seems quite repetitive! Perhaps a function getDefaultState would remove the need to copy and keep in sync amongst the tests, next time we need to update this :-)
There was a problem hiding this comment.
are you ok if we address this in a follow-up? I've been looking to re-work some shields tests for a while, can add this as well
There was a problem hiding this comment.
Absolutely, it was just a comment
bsclifton
reviewed
Jul 10, 2019
components/brave_extension/extension/brave_extension/_locales/en_US/messages.json
Outdated
Show resolved
Hide resolved
bsclifton
reviewed
Jul 10, 2019
components/brave_extension/extension/brave_extension/_locales/en_US/messages.json
Outdated
Show resolved
Hide resolved
bsclifton
reviewed
Jul 10, 2019
bsclifton
approved these changes
Jul 10, 2019
Merged
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.
close brave/brave-browser#1196
close brave/brave-browser#4953
see https://brave-ui-4200l5i5w.now.sh/?path=/story/feature-components-shields--panel
Test Plan
See brave/brave-browser#1196 for design spec
Submitter Checklist:
npm run lint)git rebase master(if needed).git rebase -ito squash commits (if needed).Test Plan:
Reviewer Checklist:
After-merge Checklist:
changes has landed on.