-
Notifications
You must be signed in to change notification settings - Fork 286
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into enhance/#8795-rrm-findMatchedPublication-…
…action.
- Loading branch information
Showing
47 changed files
with
1,600 additions
and
152 deletions.
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,64 @@ | ||
| /** | ||
| * LeanCTABanner component. | ||
| * | ||
| * 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'; | ||
| import PropTypes from 'prop-types'; | ||
|
|
||
| export default function LeanCTABanner( { | ||
| className, | ||
| children, | ||
| Icon, | ||
| SVGGraphic, | ||
| } ) { | ||
| return ( | ||
| <div | ||
| className={ classnames( | ||
| 'googlesitekit-lean-cta-banner', | ||
| className | ||
| ) } | ||
| > | ||
| <div className="googlesitekit-lean-cta-banner__body"> | ||
| { Icon && ( | ||
| <div className="googlesitekit-lean-cta-banner__body-icon"> | ||
| <Icon width="32" height="32" /> | ||
| </div> | ||
| ) } | ||
| { | ||
| <div className="googlesitekit-lean-cta-banner__body-content"> | ||
| { children } | ||
| </div> | ||
| } | ||
| </div> | ||
| { SVGGraphic && ( | ||
| <div className="googlesitekit-lean-cta-banner__graphic"> | ||
| <SVGGraphic /> | ||
| </div> | ||
| ) } | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| LeanCTABanner.propTypes = { | ||
| className: PropTypes.string, | ||
| children: PropTypes.node.isRequired, | ||
| Icon: PropTypes.elementType, | ||
| SVGGraphic: PropTypes.elementType, | ||
| }; |
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
File renamed without changes.
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
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
59 changes: 59 additions & 0 deletions
59
...dules/analytics-4/components/audience-segmentation/dashboard/AudienceTilesWidget/index.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,59 @@ | ||
| /** | ||
| * AudienceTilesWidget component. | ||
| * | ||
| * 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 PropTypes from 'prop-types'; | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import { useSelect } from 'googlesitekit-data'; | ||
| import whenActive from '../../../../../../util/when-active'; | ||
| import { MODULES_ANALYTICS_4 } from '../../../../datastore/constants'; | ||
| import AudienceTiles from './AudienceTiles'; | ||
|
|
||
| function AudienceTilesWidget( { Widget, WidgetNull } ) { | ||
| const availableAudiences = useSelect( ( select ) => { | ||
| const audiences = select( MODULES_ANALYTICS_4 ).getAvailableAudiences(); | ||
| return audiences?.map( ( audience ) => audience.name ); | ||
| } ); | ||
| const configuredAudiences = useSelect( ( select ) => | ||
| select( MODULES_ANALYTICS_4 ).getConfiguredAudiences() | ||
| ); | ||
|
|
||
| const hasMatchingAudience = configuredAudiences?.some( ( audience ) => | ||
| availableAudiences?.includes( audience ) | ||
| ); | ||
|
|
||
| if ( hasMatchingAudience ) { | ||
| return <AudienceTiles Widget={ Widget } />; | ||
| } | ||
|
|
||
| return <WidgetNull />; | ||
| } | ||
|
|
||
| AudienceTilesWidget.propTypes = { | ||
| Widget: PropTypes.elementType.isRequired, | ||
| WidgetNull: PropTypes.elementType.isRequired, | ||
| }; | ||
|
|
||
| export default whenActive( { moduleName: 'analytics-4' } )( | ||
| AudienceTilesWidget | ||
| ); |
Oops, something went wrong.