Merge remote-tracking branch 'origin/develop' into infrastructure/848…

…3-reference-date-eslint-rule.
google · Jun 13, 2024 · 088af68 · 088af68
2 parents 0ade87c + 10ff84c
commit 088af68
Show file tree

Hide file tree

Showing 71 changed files with 1,150 additions and 176 deletions.
diff --git a/.github/workflows/browserslist-db-update.yml b/.github/workflows/browserslist-db-update.yml
@@ -49,10 +49,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node.js (.nvmrc)
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'

diff --git a/.github/workflows/check-issue-has-release.yml b/.github/workflows/check-issue-has-release.yml
@@ -24,12 +24,12 @@ jobs:
     timeout-minutes: 20
     if: false == ( ( github.event_name == 'pull_request' && ( github.event.action == 'closed' || github.event.pull_request.draft == true || contains( github.head_ref, 'dependabot/' ) ) ) || github.event.pull_request.head.repo.fork ) && github.event.review.state == 'approved'
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           # Use modern Node for native fetch in script.
           node-version: '18.x'
-      
+
       - name: Check issue for release tag
         run: ./bin/check-issue-has-release.js
         env:

diff --git a/.github/workflows/compressed-size.yml b/.github/workflows/compressed-size.yml
@@ -31,10 +31,10 @@ jobs:
     timeout-minutes: 20
     if: github.event.pull_request.draft == false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Node.js (.nvmrc)
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -90,10 +90,10 @@ jobs:
     timeout-minutes: 30
     if: github.event_name == 'push' || github.event.pull_request.draft == false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Node.js (.nvmrc)
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'

diff --git a/.github/workflows/js-css-lint-test.yml b/.github/workflows/js-css-lint-test.yml
@@ -51,9 +51,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Node.js (.nvmrc)
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'

diff --git a/.github/workflows/php-lint-tests.yml b/.github/workflows/php-lint-tests.yml
@@ -45,7 +45,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: shivammathur/setup-php@v2
         with:
@@ -103,7 +103,7 @@ jobs:
       WP_MULTISITE: ${{ matrix.wp_multisite }}
       WP_VERSION: ${{ matrix.wp_version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: shivammathur/setup-php@v2
         with:

diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
@@ -56,9 +56,9 @@ jobs:
     timeout-minutes: 20
     if: false == ( ( github.event_name == 'pull_request' && ( github.event.action == 'closed' || github.event.pull_request.draft == true || contains( github.head_ref, 'dependabot/' ) ) ) || github.event.pull_request.head.repo.fork )
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Node.js (.nvmrc)
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'
@@ -79,7 +79,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-storybook
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: gh-pages
           token: ${{ secrets.GH_BOT_TOKEN }}
@@ -122,7 +122,7 @@ jobs:
     timeout-minutes: 20
     if: ( github.event_name == 'pull_request' && github.event.action == 'closed' && contains( github.head_ref, 'dependabot/' ) == false ) && github.event.pull_request.head.repo.fork == false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: gh-pages
           token: ${{ secrets.GH_BOT_TOKEN }}
@@ -148,14 +148,14 @@ jobs:
     timeout-minutes: 20
     if: false == ( ( github.event_name == 'pull_request' && ( github.event.action == 'closed' || github.event.pull_request.draft == true || contains( github.head_ref, 'dependabot/' ) ) ) || github.event.pull_request.head.repo.fork )
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Download artifacts
         uses: actions/download-artifact@v3
         with:
           name: storybook-files
           path: dist
       - name: Setup Node.js (.nvmrc)
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'

diff --git a/.github/workflows/visual-regression.yml b/.github/workflows/visual-regression.yml
@@ -39,9 +39,9 @@ jobs:
     timeout-minutes: 30
     if: github.event.pull_request.draft == false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Node.js (.nvmrc)
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'

diff --git a/.github/workflows/workflow-validation.yml b/.github/workflows/workflow-validation.yml
@@ -15,5 +15,5 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 1
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: reviewdog/action-actionlint@v1
diff --git a/.github/workflows/zips.yml b/.github/workflows/zips.yml
@@ -85,7 +85,7 @@ jobs:
     timeout-minutes: 20
     if: false == ( ( github.event_name == 'pull_request' && ( github.event.action == 'closed' || github.event.pull_request.draft == true || contains( github.head_ref, 'dependabot/' ) ) ) || github.event.pull_request.head.repo.fork )
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
           php-version: '7.4'
@@ -104,7 +104,7 @@ jobs:
       - name: Composer Install
         run: composer install --no-interaction --no-progress --no-dev
       - name: Setup Node.js (.nvmrc)
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'
@@ -139,7 +139,7 @@ jobs:
         with:
           name: zip-files
           path: ${{ github.ref }}
-      - uses: google-github-actions/auth@v1
+      - uses: google-github-actions/auth@v2
         with:
           credentials_json: ${{ secrets.GCP_CREDENTIALS }}
       - name: Upload PR files
@@ -158,7 +158,7 @@ jobs:
     steps:
       - name: Check the comment exists
         id: find-comment
-        uses: peter-evans/find-comment@v2
+        uses: peter-evans/find-comment@v3
         with:
           issue-number: ${{ github.event.pull_request.number }}
           comment-author: github-actions[bot]
@@ -176,13 +176,13 @@ jobs:
           echo "${delimiter}" >> $GITHUB_OUTPUT
       - name: Create comment on PR with links to build files
         if: ${{ steps.find-comment.outputs.comment-id == '' }}
-        uses: peter-evans/create-or-update-comment@v2
+        uses: peter-evans/create-or-update-comment@v4
         with:
           issue-number: ${{ github.event.pull_request.number }}
           body: ${{ steps.get-comment-body.outputs.body }}
       - name: Update comment on PR with links to build files
         if: ${{ steps.find-comment.outputs.comment-id != '' }}
-        uses: peter-evans/create-or-update-comment@v2
+        uses: peter-evans/create-or-update-comment@v4
         with:
           comment-id: ${{ steps.find-comment.outputs.comment-id }}
           edit-mode: replace
@@ -194,7 +194,7 @@ jobs:
     timeout-minutes: 20
     if: ( github.event_name == 'pull_request' && github.event.action == 'closed' && contains( github.head_ref, 'dependabot/' ) == false ) && github.event.pull_request.head.repo.fork == false
     steps:
-      - uses: google-github-actions/auth@v1
+      - uses: google-github-actions/auth@v2
         with:
           credentials_json: ${{ secrets.GCP_CREDENTIALS }}
       - uses: google-github-actions/setup-gcloud@v1
@@ -209,14 +209,14 @@ jobs:
     steps:
       - name: Check the comment exists
         id: find-comment
-        uses: peter-evans/find-comment@v2
+        uses: peter-evans/find-comment@v3
         with:
           issue-number: ${{ github.event.pull_request.number }}
           comment-author: github-actions[bot]
           body-includes: Build files for
       - name: Update comment on PR with links to plugin builds
         if: ${{ steps.find-comment.outputs.comment-id != '' }}
-        uses: peter-evans/create-or-update-comment@v2
+        uses: peter-evans/create-or-update-comment@v4
         with:
           comment-id: ${{ steps.find-comment.outputs.comment-id }}
           edit-mode: replace

diff --git a/assets/js/components/conversion-tracking/ConversionTrackingToggle.js b/assets/js/components/conversion-tracking/ConversionTrackingToggle.js
@@ -17,11 +17,7 @@
 /**
  * WordPress dependencies
  */
-import {
-	createInterpolateElement,
-	useState,
-	Fragment,
-} from '@wordpress/element';
+import { useState, Fragment } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 
 /**
@@ -31,15 +27,14 @@ import { Switch } from 'googlesitekit-components';
 import Data from 'googlesitekit-data';
 import { CORE_SITE } from '../../googlesitekit/datastore/site/constants';
 import ErrorText from '../../components/ErrorText';
-import Link from '../Link';
 import LoadingWrapper from '../LoadingWrapper';
 import ConfirmDisableConversionTrackingDialog from './ConfirmDisableConversionTrackingDialog';
 import { useFeature } from '../../hooks/useFeature';
 import PropTypes from 'prop-types';
 
 const { useDispatch, useSelect } = Data;
 
-export default function ConversionTrackingToggle( { loading } ) {
+export default function ConversionTrackingToggle( { children, loading } ) {
 	const iceEnabled = useFeature( 'conversionInfra' );
 	const [ saveError ] = useState( null );
 	const [ showConfirmDialog, setShowConfirmDialog ] = useState( false );
@@ -48,12 +43,6 @@ export default function ConversionTrackingToggle( { loading } ) {
 		select( CORE_SITE ).isConversionTrackingEnabled()
 	);
 
-	const conversionTrackingDocumentationURL = useSelect( ( select ) =>
-		select( CORE_SITE ).getDocumentationLinkURL(
-			'enhanced-conversion-tracking'
-		)
-	);
-
 	const isSaving = useSelect( ( select ) =>
 		select( CORE_SITE ).isFetchingSaveConversionTrackingSettings()
 	);
@@ -100,24 +89,7 @@ export default function ConversionTrackingToggle( { loading } ) {
 				tabletHeight="84px"
 			>
 				<p className="googlesitekit-settings-module__fields-group-helper-text">
-					{ createInterpolateElement(
-						__(
-							'Conversion tracking allows you to measure additional events on your site from other plugins that Site Kit integrates with to optimize your campaign performance. <a>Learn more</a>',
-							'google-site-kit'
-						),
-						{
-							a: (
-								<Link
-									href={ conversionTrackingDocumentationURL }
-									external
-									aria-label={ __(
-										'Learn more about conversion tracking',
-										'google-site-kit'
-									) }
-								/>
-							),
-						}
-					) }
+					{ children }
 				</p>
 			</LoadingWrapper>
 			{ showConfirmDialog && (
@@ -136,5 +108,6 @@ export default function ConversionTrackingToggle( { loading } ) {
 }
 
 ConversionTrackingToggle.propTypes = {
+	children: PropTypes.node.isRequired,
 	loading: PropTypes.bool,
 };
diff --git a/assets/js/components/conversion-tracking/ConversionTrackingToggle.stories.js b/assets/js/components/conversion-tracking/ConversionTrackingToggle.stories.js
@@ -25,7 +25,11 @@ import { CORE_SITE } from '../../googlesitekit/datastore/site/constants';
 import fetchMock from 'fetch-mock';
 
 function Template() {
-	return <ConversionTrackingToggle />;
+	return (
+		<ConversionTrackingToggle>
+			Example text for enhanced conversion tracking
+		</ConversionTrackingToggle>
+	);
 }
 
 export const Enabled = Template.bind( {} );