JetpackFooter: add About, Privacy and Terms links #31627
There are no files selected for viewing
This file contains 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: minor | ||
| Type: added | ||
|
|
||
| Jetpack Footer: added generic links |
This file contains 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 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 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 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,12 +1,15 @@ | ||
| import { useSelect } from '@wordpress/data'; | ||
| import { __, _x } from '@wordpress/i18n'; | ||
| import { Icon, external } from '@wordpress/icons'; | ||
| import classnames from 'classnames'; | ||
| import React from 'react'; | ||
| import { getRedirectUrl } from '../..'; | ||
| import { STORE_ID as CONNECTION_STORE_ID } from '../../../../js-packages/connection/state/store'; | ||
|
There was a problem hiding this comment. Importing from There was a problem hiding this comment. I wonder if this may prove problematic in the version of the package that we ship to npm. Couldn't we bring in that data as a new component prop, to keep the component a bit simpler?
That'd be my next suggestion, with a comment in the original file mentioning that it's copied there, but I'm not a regular component maintainer so I'll let others weigh in on this. :) There was a problem hiding this comment. Now that the connection package js is loaded externally and not bundled into any plugin after #38877, this import here can be problematic and result in duplicate store registration. We should fix this in a better way. A few options we have:
There was a problem hiding this comment. Another solution would be to use the data from the scrip-data package as explained in this thread. There was a problem hiding this comment. That said, composability is still better because that will not make the component dependent upon anything related to jetpack connection or its logic. |
||
| import AutomatticBylineLogo from '../automattic-byline-logo'; | ||
| import './style.scss'; | ||
| import JetpackLogo from '../jetpack-logo'; | ||
| import useBreakpointMatch from '../layout/use-breakpoint-match'; | ||
| import type { JetpackFooterProps, JetpackFooterMenuItem } from './types'; | ||
|
|
||
| const JetpackIcon: React.FC = () => ( | ||
| <JetpackLogo logoColor="#000" showText={ false } height={ 16 } aria-hidden="true" /> | ||
|
|
@@ -19,17 +22,72 @@ const JetpackIcon: React.FC = () => ( | |
| * @returns {React.ReactNode} JetpackFooter component. | ||
| */ | ||
| const JetpackFooter: React.FC< JetpackFooterProps > = ( { | ||
| moduleName = __( 'Jetpack', 'jetpack' ), | ||
| className, | ||
| moduleNameHref = 'https://jetpack.com', | ||
| menu, | ||
| siteAdminUrl, | ||
| onAboutClick, | ||
| onPrivacyClick, | ||
| onTermsClick, | ||
| ...otherProps | ||
| } ) => { | ||
| const [ isSm ] = useBreakpointMatch( 'sm', '<=' ); | ||
| const [ isMd ] = useBreakpointMatch( 'md', '<=' ); | ||
| const [ isLg ] = useBreakpointMatch( 'lg', '>' ); | ||
|
|
||
| const { isActive, connectedPlugins } = useSelect( | ||
| select => { | ||
| const connectionStatus = select( CONNECTION_STORE_ID ) as { | ||
| getConnectedPlugins: () => { slug: string }[]; | ||
| getConnectionStatus: () => { isActive: boolean }; | ||
| }; | ||
|
|
||
| return { | ||
| connectedPlugins: connectionStatus?.getConnectedPlugins(), | ||
| ...connectionStatus.getConnectionStatus(), | ||
| }; | ||
| }, | ||
| [ CONNECTION_STORE_ID ] | ||
| ); | ||
|
|
||
| const areAdminLinksEnabled = | ||
| siteAdminUrl && | ||
|
There was a problem hiding this comment. Ideally, There was a problem hiding this comment. We now have import { getAdminUrl, getJetpackAdminPageUrl } from '@automattic/jetpack-script-data';
const aboutPageUrl = getAdminUrl( 'admin.php?page=jetpack_about' );
const privacyPageUrl = getJetpackAdminPageUrl( '#/privacy' );There was a problem hiding this comment. Likewise, you can use the same package to get the list of connected plugins and the status. import { getScriptData } from '@automattic/jetpack-script-data';
const { connectedPlugins, connectionStatus } = getScriptData().connection; |
||
| // Some admin pages require the site to be connected (e.g., Privacy) | ||
| isActive && | ||
| // Admin pages are part of the Jetpack plugin and required it to be installed | ||
| connectedPlugins?.some( ( { slug } ) => 'jetpack' === slug ); | ||
|
|
||
| let items: JetpackFooterMenuItem[] = [ | ||
| { | ||
| label: _x( 'About', 'Link to learn more about Jetpack.', 'jetpack' ), | ||
| title: __( 'About Jetpack', 'jetpack' ), | ||
| href: getRedirectUrl( 'jetpack-about' ), | ||
| target: '_blank', | ||
| onClick: onAboutClick, | ||
| }, | ||
| { | ||
| label: _x( 'Privacy', 'Shorthand for Privacy Policy.', 'jetpack' ), | ||
| title: __( "Automattic's Privacy Policy", 'jetpack' ), | ||
| href: areAdminLinksEnabled | ||
| ? new URL( 'admin.php?page=jetpack#/privacy', siteAdminUrl ).href | ||
| : getRedirectUrl( 'a8c-privacy' ), | ||
| target: areAdminLinksEnabled ? '_self' : '_blank', | ||
| onClick: onPrivacyClick, | ||
| }, | ||
| { | ||
| label: _x( 'Terms', 'Shorthand for Terms of Service.', 'jetpack' ), | ||
| title: __( 'WordPress.com Terms of Service', 'jetpack' ), | ||
| href: getRedirectUrl( 'wpcom-tos' ), | ||
| target: '_blank', | ||
| onClick: onTermsClick, | ||
| }, | ||
| ]; | ||
|
|
||
| if ( menu ) { | ||
| items = [ ...items, ...menu ]; | ||
| } | ||
|
|
||
| const jetpackItemContent = ( | ||
| <> | ||
| <JetpackIcon /> | ||
|
|
@@ -59,7 +117,7 @@ const JetpackFooter: React.FC< JetpackFooterProps > = ( { | |
| jetpackItemContent | ||
| ) } | ||
| </li> | ||
| { items.map( item => { | ||
| const isButton = item.role === 'button'; | ||
| const isExternalLink = ! isButton && item.target === '_blank'; | ||
|
|
||
|
|
@@ -85,7 +143,14 @@ const JetpackFooter: React.FC< JetpackFooterProps > = ( { | |
| ); | ||
| } ) } | ||
| <li className="jp-dashboard-footer__a8c-item"> | ||
| <a | ||
| href={ | ||
| areAdminLinksEnabled | ||
| ? new URL( 'admin.php?page=jetpack_about', siteAdminUrl ).href | ||
| : getRedirectUrl( 'a8c-about' ) | ||
| } | ||
| aria-label={ __( 'An Automattic Airline', 'jetpack' ) } | ||
| > | ||
| <AutomatticBylineLogo aria-hidden="true" /> | ||
| </a> | ||
| </li> | ||
|
|
||
This file contains 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 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 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 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 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 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.
hrefof the Automattic logo is set inJetpackFooterdirectly.