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

Licensing: Add conditional Protect redirect post Scan license activation #39007

Merged
merged 10 commits into from
Sep 3, 2024
Merged

Licensing: Add conditional Protect redirect post Scan license activation #39007

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ea83c6a
Add Protect redirect to activation-screen-success-info primary-link
dkmyta Aug 21, 2024
2ef0b46
Revert unintended changes
dkmyta Aug 21, 2024
e0ed96e
changelog
dkmyta Aug 21, 2024
add7ea7
Merge branch 'trunk' into add/licensing-protect-redirect
dkmyta Aug 21, 2024
86b5d01
Merge branch 'trunk' into add/licensing-protect-redirect
dkmyta Aug 26, 2024
fc4e5f0
Fix versions
dkmyta Aug 26, 2024
8749ad4
Merge branch 'trunk' into add/licensing-protect-redirect
dkmyta Aug 27, 2024
e827342
Revert version update
dkmyta Aug 27, 2024
7c3db0a
Update redirect path
dkmyta Sep 3, 2024
163d85c
Merge branch 'trunk' into add/licensing-protect-redirect
dkmyta Sep 3, 2024
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
4 changes: 4 additions & 0 deletions projects/js-packages/licensing/changelog/add-licensing-protect-redirect
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Adds a conditional Protect redirect post scan license activation
12 changes: 12 additions & 0 deletions ...ts/js-packages/licensing/components/activation-screen-success-info/primary-link/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const PrimaryLink = props => {
const isJetpackSocialActive = isPluginActive( 'Jetpack Social' );
const isJetpackSocialProduct =
productGroup === 'jetpack_social_advanced' || productGroup === 'jetpack_social_basic';
const isJetpackProtectActive = isPluginActive( 'Jetpack Protect' );

if ( isFetching ) {
return (
Expand Down Expand Up @@ -48,6 +49,17 @@ const PrimaryLink = props => {
);
}

if ( productGroup === 'jetpack_scan' ) {
const redirectSource = isJetpackProtectActive
? siteAdminUrl + 'admin.php?page=jetpack-protect#/scan'
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
? siteAdminUrl + 'admin.php?page=jetpack-protect#/scan'
? siteAdminUrl + 'admin.php?page=jetpack-protect'

: getRedirectUrl( 'jetpack-license-activation-success-scan', { site: siteRawUrl } );
return (
<Button className="jp-license-activation-screen-success-info--button" href={ redirectSource }>
{ __( 'View scan results', 'jetpack' ) }
</Button>
);
}

// If the user has not completed the first step of the Assistant, make the primary button link to it.
if ( currentRecommendationsStep === 'not-started' ) {
return (
Expand Down
4 changes: 2 additions & 2 deletions ...ts/js-packages/licensing/components/activation-screen-success-info/product-link/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ const ProductLink = props => {
redirectSource: 'jetpack-license-activation-success-backup',
},
jetpack_scan: {
text: __( 'View scan results', 'jetpack' ),
redirectSource: 'jetpack-license-activation-success-scan',
text: __( 'View my plans', 'jetpack' ),
redirectSource: 'license-activation-view-my-plans',
},
jetpack_search: {
text: __( 'Configure search', 'jetpack' ),
Expand Down
Loading