Repository navigation
My Jetpack: migrate Add License activation screen to @wordpress/ui buttons and links #50343
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| Significance: patch | ||
| Type: changed | ||
|
|
||
| Activation screen: migrate the license activation buttons and support links to @wordpress/ui primitives. |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -55,15 +55,6 @@ | |
| ol > li::marker { | ||
| font-weight: 700; | ||
| } | ||
| } | ||
|
|
||
| .jp-license-activation-screen-controls { | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| import { getRedirectUrl } from '@automattic/jetpack-components'; | ||
| import { createInterpolateElement } from '@wordpress/element'; | ||
| import { __ } from '@wordpress/i18n'; | ||
| import { Link } from '@wordpress/ui'; | ||
| import PropTypes from 'prop-types'; | ||
|
|
||
| import './style.scss'; | ||
|
|
@@ -25,7 +26,14 @@ const ActivationScreenIllustration = props => { | |
| { createInterpolateElement( | ||
| __( 'Do you need help? <a>Contact us.</a>', 'jetpack-licensing' ), | ||
| { | ||
| a: ( | ||
| <Link | ||
| openInNewTab | ||
| href={ getRedirectUrl( 'jetpack-support-license-activation' ) } | ||
| rel="noopener noreferrer" | ||
|
Member
There was a problem hiding this comment. You can remove |
||
| children={ null } | ||
| /> | ||
| ), | ||
| } | ||
| ) } | ||
| </p> | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| import { getRedirectUrl } from '@automattic/jetpack-components'; | ||
| import { __ } from '@wordpress/i18n'; | ||
| import { Button } from '@wordpress/ui'; | ||
| import PropTypes from 'prop-types'; | ||
| import useActivePlugins from '../../../hooks/use-active-plugins'; | ||
| import { getProductGroup } from '../../activation-screen/utils'; | ||
|
|
@@ -21,27 +21,36 @@ const PrimaryLink = props => { | |
| productGroup === 'jetpack_social_advanced' || productGroup === 'jetpack_social_basic'; | ||
| const isJetpackProtectActive = isPluginActive( 'Jetpack Protect' ); | ||
|
|
||
| // The success-screen CTAs only navigate the current tab. Using onClick keeps | ||
| // a native @wordpress/ui <button> (so its styles render untouched) rather | ||
| // than rendering it as an anchor. | ||
| const navigateTo = url => () => { | ||
| window.location.href = url; | ||
| }; | ||
|
|
||
| if ( isFetching ) { | ||
| return ( | ||
| <Button | ||
| className="jp-license-activation-screen-success-info--button" | ||
| loading | ||
| loadingAnnouncement={ __( 'Loading…', 'jetpack-licensing' ) } | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| if ( isJetpackSocialProduct && ( isJetpackActive || isJetpackSocialActive ) ) { | ||
| return ( | ||
| <Button | ||
| className="jp-license-activation-screen-success-info--button" | ||
| onClick={ navigateTo( | ||
|
Member
There was a problem hiding this comment. Flagging the need for recently added |
||
| siteAdminUrl + | ||
| ( isJetpackActive | ||
| ? 'admin.php?page=jetpack#/recommendations/' + | ||
| ( productGroup === 'jetpack_social_advanced' | ||
| ? 'welcome-social-advanced' | ||
| : 'welcome-social-basic' ) | ||
| : 'admin.php?page=jetpack-social' ) | ||
| ) } | ||
| > | ||
| { __( 'Configure my site', 'jetpack-licensing' ) } | ||
| </Button> | ||
|
|
@@ -53,7 +62,10 @@ const PrimaryLink = props => { | |
| ? siteAdminUrl + 'admin.php?page=jetpack-protect' | ||
| : getRedirectUrl( 'jetpack-license-activation-success-scan', { site: siteRawUrl } ); | ||
| return ( | ||
| <Button | ||
| className="jp-license-activation-screen-success-info--button" | ||
| onClick={ navigateTo( redirectSource ) } | ||
|
Comment on lines
+66
to
+68
Member
There was a problem hiding this comment. This can also be switched to |
||
| > | ||
| { __( 'View scan results', 'jetpack-licensing' ) } | ||
| </Button> | ||
| ); | ||
|
|
@@ -64,7 +76,7 @@ const PrimaryLink = props => { | |
| return ( | ||
| <Button | ||
| className="jp-license-activation-screen-success-info--button" | ||
| onClick={ navigateTo( siteAdminUrl + 'admin.php?page=jetpack#/recommendations' ) } | ||
| > | ||
| { __( 'Configure my site', 'jetpack-licensing' ) } | ||
| </Button> | ||
|
|
@@ -74,7 +86,9 @@ const PrimaryLink = props => { | |
| return ( | ||
| <Button | ||
| className="jp-license-activation-screen-success-info--button" | ||
| onClick={ navigateTo( | ||
| getRedirectUrl( 'license-activation-view-my-plans', { site: siteRawUrl } ) | ||
| ) } | ||
|
Comment on lines
+90
to
+92
Member
There was a problem hiding this comment. This can also be switched to |
||
| > | ||
| { __( 'View my plans', 'jetpack-licensing' ) } | ||
| </Button> | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,13 @@ | ||
| // Scoped under the container to reach specificity (0,2,0), matching the | ||
| // Activate button's rule. A bare `--button` selector (0,1,0) only ties | ||
| // @wordpress/ui's runtime-injected button reset and loses on source order. | ||
| .jp-license-activation-screen-success-info { | ||
|
|
||
| .jp-license-activation-screen-success-info--button { | ||
| font-weight: var(--wpds-typography-font-weight-medium); | ||
| font-size: var(--wpds-typography-font-size-lg); | ||
| width: auto; | ||
| padding-inline: var(--wpds-dimension-padding-3xl); | ||
| padding-block: var(--wpds-dimension-padding-lg); | ||
| } | ||
| } |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,11 @@ | ||
| // Match the primary button's font so the link reads as its pair. Scoped under | ||
| // the container to reach 0,2,0 and override @wordpress/ui's injected reset | ||
| // (same reason as the button rule). | ||
| .jp-license-activation-screen-success-info { | ||
|
|
||
| .jp-license-activation-screen-success-info--external-link { | ||
| font-weight: var(--wpds-typography-font-weight-medium); | ||
| font-size: var(--wpds-typography-font-size-lg); | ||
| white-space: nowrap; | ||
| } | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need these style overrides? Ideally, we'd use the design system as-is without overrides, which are unwieldy to maintain.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks quite off without them, there is not variant for size. Good thing is they are all under a single class, we can easily remove them. Let me get screenshots before calling for some design advise.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yah it might just need a design change/decision or keep as custom but good to make that decision intentionally rather than just leave be because that's how it was before. 🙂