-
Notifications
You must be signed in to change notification settings - Fork 286
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.
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
Add new notice components for both modules. #9460
Merged
+234
−62
Merged
Changes from 19 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
bec280e
Add new notice components for both modules.
aaemnnosttv 32d9585
Add notices to setup forms.
aaemnnosttv defde78
Enable ECT on setup success.
aaemnnosttv e24fe37
Update indexes to include new components.
aaemnnosttv aff5a4d
Allow providing wrapper component via prop.
aaemnnosttv 448eb0d
Update AccountCreate to preserve output when conversion tracking noti…
aaemnnosttv 6d91ebf
Update tests for GA4 AccountCreate.
aaemnnosttv 095b972
Refactor test.
aaemnnosttv 41d21b3
Remove unnecessary setAccountID.
aaemnnosttv 14c4b11
Update test to handle conversion tracking requests.
aaemnnosttv 23e565e
Refactor with common component.
aaemnnosttv 3e28b1c
Update styles.
aaemnnosttv 959b121
Expose registry in Storybook.
aaemnnosttv 1c70d10
Update position of notice in AccountCreate form.
aaemnnosttv 09c0308
Remove unnecessary wrapper.
aaemnnosttv e91d431
Approve visual changes.
aaemnnosttv f4a130e
Update snapshot.
aaemnnosttv 4f600e8
Approve visual changes.
aaemnnosttv 65cf9e7
Apply suggestions from code review.
tofumatt 5b48a20
Add a comment for the important flag.
tofumatt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
50 changes: 50 additions & 0 deletions
50
assets/js/components/conversion-tracking/SetupEnhancedConversionTrackingNotice.js
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,50 @@ | ||
/** | ||
* Site Kit by Google, Copyright 2024 Google LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
/** | ||
* External dependencies | ||
*/ | ||
import classnames from 'classnames'; | ||
|
||
/** | ||
* Internal dependencies | ||
*/ | ||
import { useSelect } from 'googlesitekit-data'; | ||
import { CORE_SITE } from '../../googlesitekit/datastore/site/constants'; | ||
|
||
export default function SetupEnhancedConversionTrackingNotice( { | ||
className, | ||
message, | ||
} ) { | ||
const isCTEnabled = useSelect( ( select ) => | ||
select( CORE_SITE ).isConversionTrackingEnabled() | ||
); | ||
|
||
if ( isCTEnabled || isCTEnabled === undefined ) { | ||
return null; | ||
} | ||
|
||
return ( | ||
<p | ||
className={ classnames( | ||
className, | ||
'googlesitekit-color--surfaces-on-background-variant' | ||
) } | ||
> | ||
{ message } | ||
</p> | ||
); | ||
} |
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
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.
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.
This is a great comment 😄