Skip to content

/ ghostery-extension

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

Jump to bottom

GH-2258: Preserve user onboarding settings #681

Merged
merged 10 commits into from Mar 15, 2021
+218 −95
Merged

GH-2258: Preserve user onboarding settings #681

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c53210c
Preserve onboarding selections on back
leuryr Feb 8, 2021
45caa11
Simplify and fix default browser check
leuryr Feb 19, 2021
ccfb5dc
Remove antiSuite wrapper, update checkbox
leuryr Feb 19, 2021
a3c31a1
Refactor question blocks
leuryr Feb 22, 2021
1cadc46
Use Blocking Policy constants
leuryr Feb 22, 2021
04e7348
Update tests and PropTypes
leuryr Feb 22, 2021
06aa58e
Refactor blocking policy handling
leuryr Feb 22, 2021
ebbab47
Update recommended choices check
leuryr Mar 10, 2021
fe4c852
Remove recommendedChoices
leuryr Mar 11, 2021
ae7fdee
Merge in develop
wlycdgr Mar 11, 2021
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next
Loading status checks…

Refactor question blocks

  • Loading branch information
@leuryr
leuryr committed Feb 22, 2021
commit a3c31a13f185100fb3d96fa963c0f323df2d166d
47 app/dawn-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx
View file
Open in desktop
@@ -195,6 +195,24 @@ class BlockSettingsView extends Component {
}
}

renderQuestion = (question, tooltip = null) => {
if (tooltip) {
return (
<li className="BlockSettingsView_question">
<div className="BlockSettingsView_questionBlock">
{question}
<div className="BlockSettingsView__infoIcon g-tooltip">
<Tooltip header={tooltip} position="top" delay="300" isOnboardingHub />
</div>
</div>
</li>
);
}
return (
<li className="BlockSettingsView_question">{question}</li>
);
}

renderAnswerBlock = (checked, category, answer, label) => (
<div className="BlockSettingsView_answerBlock" onClick={() => this.handleAnswerChange(category, answer)}>
<div className="BlockSettingsView__radioButtonContainer">
@@ -233,38 +251,17 @@ class BlockSettingsView extends Component {
<div className="BlockSettingsView_checkboxLabel" onClick={() => this.toggleRecommendedChoices(!recommendedChoices)}>{t('ghostery_dawn_onboarding_recommended_choices')}</div>
</div>
<ol>
<li className="BlockSettingsView_question">{t('ghostery_dawn_onboarding_question_block_ads')}</li>
{this.renderQuestion(t('ghostery_dawn_onboarding_question_block_ads'))}
{this.renderAnswerBlock((enable_ad_block === true), 'enable_ad_block', true, t('hub_setup_modal_button_yes'))}
{this.renderAnswerBlock((enable_ad_block === false), 'enable_ad_block', false, t('hub_setup_modal_button_no'))}
<li className="BlockSettingsView_question">
<div className="BlockSettingsView_questionBlock">
{t('ghostery_dawn_onboarding_question_kinds_of_trackers')}
<div className="BlockSettingsView__infoIcon g-tooltip">
<Tooltip header={t('ghostery_dawn_onboarding_info_blocking_all')} position="top" delay="300" isOnboardingHub />
</div>
</div>
</li>
{this.renderQuestion(t('ghostery_dawn_onboarding_question_kinds_of_trackers'), t('ghostery_dawn_onboarding_info_blocking_all'))}
{this.renderAnswerBlock((kindsOfTrackers === 1), 'kindsOfTrackers', 1, t('ghostery_dawn_onboarding_kinds_of_trackers_all'))}
{this.renderAnswerBlock((kindsOfTrackers === 2), 'kindsOfTrackers', 2, t('ghostery_dawn_onboarding_kinds_of_trackers_ad_and_analytics'))}
{this.renderAnswerBlock((kindsOfTrackers === 3), 'kindsOfTrackers', 3, t('ghostery_dawn_onboarding_kinds_of_trackers_none'))}
<li className="BlockSettingsView_question">
<div className="BlockSettingsView_questionBlock">
{t('ghostery_dawn_onboarding_question_anti_tracking')}
<div className="BlockSettingsView__infoIcon g-tooltip">
<Tooltip header={t('ghostery_dawn_onboarding_info_anti_tracking')} position="top" delay="300" isOnboardingHub />
</div>
</div>
</li>
{this.renderQuestion(t('ghostery_dawn_onboarding_question_anti_tracking'), t('ghostery_dawn_onboarding_info_anti_tracking'))}
{this.renderAnswerBlock((enable_anti_tracking === true), 'enable_anti_tracking', true, t('hub_setup_modal_button_yes'))}
{this.renderAnswerBlock((enable_anti_tracking === false), 'enable_anti_tracking', false, t('hub_setup_modal_button_no'))}
<li className="BlockSettingsView_question">
<div className="BlockSettingsView_questionBlock">
{t('ghostery_dawn_onboarding_question_smart_browsing')}
<div className="BlockSettingsView__infoIcon g-tooltip">
<Tooltip header={t('ghostery_dawn_onboarding_info_smart_browsing')} position="top" delay="300" isOnboardingHub />
</div>
</div>
</li>
{this.renderQuestion(t('ghostery_dawn_onboarding_question_smart_browsing'), t('ghostery_dawn_onboarding_info_smart_browsing'))}
{this.renderAnswerBlock((enable_smart_block === true), 'enable_smart_block', true, t('hub_setup_modal_button_yes'))}
{this.renderAnswerBlock((enable_smart_block === false), 'enable_smart_block', false, t('hub_setup_modal_button_no'))}
</ol>
ProTip! Use n and p to navigate between commits in a pull request.