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

GH-2216: Disable setup sidebar link on fourth page of setup #631

Merged
merged 8 commits into from Nov 20, 2020

Conversation

@benstrumeyer
Copy link
Contributor

@benstrumeyer benstrumeyer commented Nov 12, 2020

  • Have you followed the guidelines in CONTRIBUTING.md?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Have you added an explanation of what your changes do?
  • Does your submission pass tests?
  • Did you lint your code prior to submission?
  • Use window.location.href to disable the sidebar link which previously led to a blank view

Ticket: https://ghostery.atlassian.net/browse/GH-2216

@benstrumeyer benstrumeyer added this to the 8.5.4 milestone Nov 12, 2020
@benstrumeyer benstrumeyer requested a review from wlycdgr Nov 12, 2020
@benstrumeyer benstrumeyer self-assigned this Nov 12, 2020
// Disable the sidebar link that leads to a blank screen on custom setup page 4 (GH-2216)
const shouldDisableSetupLink = (window.location.href.indexOf('setup/4') > -1) && (item.href.substring(1) === 'setup');

Comment on lines 32 to 34

This comment has been minimized.

@wlycdgr

wlycdgr Nov 13, 2020
Member

Let's instead modify the disableRegEx in the render() method of sideNavigationViewContainer. That way we don't need to add new code or unnecessarily test every sidebar item. I think it's ok that users can't navigate away to other tabs from that screen without pressing "Done".

This comment has been minimized.

@benstrumeyer

benstrumeyer Nov 13, 2020
Author Contributor

That makes sense, updated!

@benstrumeyer benstrumeyer requested a review from wlycdgr Nov 13, 2020
Ilya Zarembsky
Copy link
Member

@wlycdgr wlycdgr left a comment

LGTM

@christophertino christophertino merged commit c4f7762 into develop Nov 20, 2020
2 checks passed
2 checks passed
@travis-ci
Travis CI - Branch Build Passed
Details
@travis-ci
Travis CI - Pull Request Build Passed
Details
@christophertino christophertino deleted the GH-2216 branch Nov 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants