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.

Sign up for GitHub

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

Jetpack Cloud: replace the credentials with a Banner when Jetpack section is enabled #43125

Merged
merged 1 commit into from
Jun 10, 2020
Merged

Jetpack Cloud: replace the credentials with a Banner when Jetpack section is enabled #43125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion client/my-sites/site-settings/settings-security/main.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import { localize } from 'i18n-calypso';
/**
* Internal dependencies
*/
import config from 'config';
import Banner from 'components/banner';
import DocumentHead from 'components/data/document-head';
import FormSecurity from 'my-sites/site-settings/form-security';
import getRewindState from 'state/selectors/get-rewind-state';
Expand Down Expand Up @@ -53,7 +55,10 @@ const SiteSettingsSecurity = ( {
);
const hasScanProduct = sitePurchases.some( ( p ) => p.productSlug.includes( 'jetpack_scan' ) );

const showCredentials = isRewindActive || hasScanProduct;
// If Jetpack section is enabled, we no longer display the credentials here, instead we
// display a Banner with a CTA that points to their new location (Settings > Jetpack).
const isJetpackSectionEnabled = config.isEnabled( 'jetpack/features-section' );
const showCredentials = ( isRewindActive || hasScanProduct ) && ! isJetpackSectionEnabled;

return (
<Main className="settings-security site-settings">
Expand All @@ -69,6 +74,20 @@ const SiteSettingsSecurity = ( {
/>
<SiteSettingsNavigation site={ site } section="security" />
{ showCredentials && <JetpackCredentials /> }
{ isJetpackSectionEnabled && (
<Banner
callToAction="Take me there!"
title={ translate( 'Looking for Jetpack backups and security scans settings?' ) }
description={ translate(
"In order to simplify your experience we've moved these to their dedicated section under the Jetpack settings tab."
) }
dismissPreferenceName="backup-scan-security-settings-moved"
dismissTemporary
horizontal
href="/settings/jetpack"
jetpack
/>
) }
<JetpackMonitor />
<FormSecurity />
</Main>
Expand Down