364 add the integration card for google site kit #21946
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,139 @@ | ||||||
| import { __, sprintf } from "@wordpress/i18n"; | ||||||
| import { CheckIcon, XIcon } from "@heroicons/react/solid"; | ||||||
| import { Fragment, createInterpolateElement, useMemo, useCallback } from "@wordpress/element"; | ||||||
| import { SimpleIntegration } from "./simple-integration"; | ||||||
| import { ReactComponent as SiteKitLogo } from "../../images/site-kit-logo.svg"; | ||||||
| import { get } from "lodash"; | ||||||
| import { useToggleState } from "@yoast/ui-library"; | ||||||
| import { SiteKitConsentModal } from "../shared-admin/components"; | ||||||
|
|
||||||
| const integration = { | ||||||
| name: "Site Kit by Google", | ||||||
| claim: createInterpolateElement( | ||||||
| sprintf( | ||||||
| /* translators: 1: bold open tag; 2: Site Kit by Google; 3: bold close tag. */ | ||||||
| __( "Get valuable insights with %1$s%2$s%3$s", "wordpress-seo" ), | ||||||
| "<strong>", | ||||||
| "Site Kit by Google", | ||||||
| "</strong>" | ||||||
| ), { | ||||||
| strong: <strong />, | ||||||
| } | ||||||
| ), | ||||||
| learnMoreLink: "https://yoa.st/integrations-google-site-kit", | ||||||
| logoLink: "https://yoa.st/integrations-google-site-kit", | ||||||
| slug: "google-site-kit", | ||||||
| description: __( "View traffic and search rankings on your dashboard by connecting your Google account.", "wordpress-seo" ), | ||||||
| isPremium: false, | ||||||
| isNew: false, | ||||||
| isMultisiteAvailable: false, | ||||||
| logo: SiteKitLogo, | ||||||
| }; | ||||||
|
|
||||||
| const buttonLabels = { | ||||||
|
There was a problem hiding this comment. Why only labels and not also the rest of the button props? |
||||||
| install: sprintf( | ||||||
| /* translators: 1: Site Kit by Google */ | ||||||
| __( "Install %1$s", "wordpress-seo" ), | ||||||
| "Site Kit by Google" | ||||||
|
There was a problem hiding this comment. They do translate |
||||||
| ), | ||||||
| activate: sprintf( | ||||||
| /* translators: 1: Site Kit by Google */ | ||||||
| __( "Activate %1$s", "wordpress-seo" ), | ||||||
| "Site Kit by Google" | ||||||
| ), | ||||||
| setup: sprintf( | ||||||
| /* translators: 1: Site Kit by Google */ | ||||||
| __( "Set up %1$s", "wordpress-seo" ), | ||||||
| "Site Kit by Google" | ||||||
| ), | ||||||
| connect: sprintf( | ||||||
| /* translators: 1: Site Kit by Google */ | ||||||
| __( "Connect %1$s", "wordpress-seo" ), | ||||||
| "Site Kit by Google" | ||||||
| ), | ||||||
| disconnect: __( "Disconnect", "wordpress-seo" ), | ||||||
| }; | ||||||
|
|
||||||
| /** | ||||||
| * The Site Kit integration component. | ||||||
| * | ||||||
| * @returns {WPElement} The Site Kit integration component. | ||||||
| */ | ||||||
| export const GoogleSiteKitIntegration = () => { | ||||||
| const { isActive, afterSetup, isInstalled, isConnected } = get( window, "wpseoIntegrationsData.googleSiteKit", { isActive: false, afterSetup: false, isInstalled: false, isConnected: false } ); | ||||||
|
There was a problem hiding this comment. I think you should not read the window state inside this component. That would've made your tests also more straight forward to use normal props for component rendering. |
||||||
| const [ isModalOpen, toggleModal ] = useToggleState( false ); | ||||||
|
|
||||||
| const getButtonConfig = useCallback( () => { | ||||||
|
There was a problem hiding this comment. Instead of config. These are the props, right? E.g. |
||||||
| const button = { | ||||||
| className: "yst-mt-6 yst-w-full", | ||||||
| as: "a", | ||||||
|
There was a problem hiding this comment. Weird that the |
||||||
| id: "google-site-kit-button", | ||||||
| }; | ||||||
|
|
||||||
| if ( ! isInstalled ) { | ||||||
|
There was a problem hiding this comment. This giant if/else is a bit bewildering. Later on you combine states as well. I wonder if this can be done in an easier way. |
||||||
| button.children = buttonLabels.install; | ||||||
| button.href = "/wp-admin/plugin-install.php?s=google%2520site%2520kit&tab=search&type=term"; | ||||||
|
There was a problem hiding this comment. This and below, the admin URLs should be retrieved from PHP to ensure compatibility for changes. See the integration' use of |
||||||
| } else if ( ! isActive ) { | ||||||
| button.children = buttonLabels.activate; | ||||||
| button.href = "/wp-admin/plugins.php"; | ||||||
| } else if ( ! afterSetup ) { | ||||||
| button.children = buttonLabels.setup; | ||||||
| button.href = "/wp-admin/admin.php?page=googlesitekit-splash"; | ||||||
| } else if ( ! isConnected ) { | ||||||
| button.children = buttonLabels.connect; | ||||||
| button.onClick = toggleModal; | ||||||
| button.as = "button"; | ||||||
| } else if ( isConnected ) { | ||||||
| button.children = buttonLabels.disconnect; | ||||||
| button.as = "button"; | ||||||
| button.variant = "secondary"; | ||||||
| } | ||||||
|
|
||||||
| return button; | ||||||
| }, [ isInstalled, isActive, afterSetup, isConnected ] ); | ||||||
|
|
||||||
| const notConnected = useMemo( () => ! isConnected || ! afterSetup, [ isConnected, afterSetup ] ); | ||||||
| const pluginNotDetected = useMemo( () => ! isActive || ! isInstalled, [ isActive, isInstalled ] ); | ||||||
| const successfullyConnected = useMemo( () => isActive && afterSetup && isConnected, [ isActive, afterSetup, isConnected ] ); | ||||||
|
There was a problem hiding this comment. These |
||||||
|
|
||||||
| return ( | ||||||
| <> | ||||||
| <SimpleIntegration | ||||||
| integration={ integration } | ||||||
| isActive={ isInstalled && isActive } | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| button={ getButtonConfig( isInstalled, isActive, afterSetup, isConnected ) } | ||||||
| > | ||||||
|
|
||||||
| { successfullyConnected && <Fragment> | ||||||
| <span className="yst-text-slate-700 yst-font-medium">{ __( "Successfully connected", "wordpress-seo" ) }</span> | ||||||
| <CheckIcon | ||||||
| className="yst-h-5 yst-w-5 yst-text-green-400 yst-flex-shrink-0" | ||||||
| /> | ||||||
| </Fragment> } | ||||||
|
|
||||||
| { notConnected && isActive && <Fragment> | ||||||
| <span className="yst-text-slate-700 yst-font-medium"> | ||||||
| { | ||||||
| __( "Not connected", "wordpress-seo" ) | ||||||
| } | ||||||
| </span> | ||||||
| <XIcon | ||||||
| className="yst-h-5 yst-w-5 yst-text-red-500 yst-flex-shrink-0" | ||||||
| /> | ||||||
| </Fragment> } | ||||||
|
|
||||||
| { pluginNotDetected && <Fragment> | ||||||
| <span className="yst-text-slate-700 yst-font-medium"> | ||||||
| { | ||||||
| __( "Plugin not detected", "wordpress-seo" ) | ||||||
| } | ||||||
| </span> | ||||||
| <XIcon | ||||||
| className="yst-h-5 yst-w-5 yst-text-red-500 yst-flex-shrink-0" | ||||||
| /> | ||||||
| </Fragment> } | ||||||
| </SimpleIntegration> | ||||||
| <SiteKitConsentModal isOpen={ isModalOpen } onClose={ toggleModal } /> | ||||||
| </> | ||||||
| ); | ||||||
| }; | ||||||
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
|
There was a problem hiding this comment. You expect this to be reused in the dashboard? |
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,32 @@ | ||
| import { Modal } from "@yoast/ui-library"; | ||
| import { __ } from "@wordpress/i18n"; | ||
| import { PropTypes } from "prop-types"; | ||
|
|
||
| /** | ||
| * The Site Kit consent modal component. | ||
| * | ||
| * @param {boolean} isOpen Whether the modal is open. | ||
| * @param {Function} onClose Callback to close the modal. | ||
| * | ||
| * @returns {WPElement} The Site Kit consent modal component. | ||
|
There was a problem hiding this comment. We normally type this as There was a problem hiding this comment. Right, my mistake! |
||
| */ | ||
| export const SiteKitConsentModal = ( { isOpen, onClose } ) => { | ||
| return ( | ||
| <Modal | ||
| isOpen={ isOpen } | ||
| onClose={ onClose } | ||
| > | ||
| <Modal.Panel> | ||
| <Modal.Title>{ __( "Connect Site Kit by Google", "wordpress-seo" ) }</Modal.Title> | ||
| <Modal.Description> | ||
| <p>{ __( "Connect your Google account to view traffic and search rankings on your dashboard.", "wordpress-seo" ) }</p> | ||
|
There was a problem hiding this comment. The |
||
| </Modal.Description> | ||
| </Modal.Panel> | ||
| </Modal> | ||
| ); | ||
| }; | ||
|
|
||
| SiteKitConsentModal.propTypes = { | ||
| isOpen: PropTypes.bool, | ||
| onClose: PropTypes.func, | ||
| }; | ||
Oops, something went wrong.
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.
Not translated?
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.
None of the cards names are translated, so I guess we should translate all the rest (or some)?