Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Make sure expression before && is always boolean in React rendering in marketing page #37227

Merged
merged 2 commits into from Mar 17, 2023
Merged

Make sure expression before && is always boolean in React rendering in marketing page #37227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aef2219
Make sure expression before && is always boolean in React rendering i…
ecgan Mar 15, 2023
dd6856a
Add changelog.
ecgan Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/woocommerce-admin/client/marketing/components/CollapsibleCard/CollapsibleCard.tsx
View file
Open in desktop
Expand Up @@ -64,7 +64,7 @@ const CollapsibleCard: React.FC< CollapsibleCardProps > = ( {
{ ! collapsed && (
<>
{ children }
{ footer && <CardFooter>{ footer }</CardFooter> }
{ !! footer && <CardFooter>{ footer }</CardFooter> }
</>
) }
</Card>
Expand Down
4 changes: 2 additions & 2 deletions plugins/woocommerce-admin/client/marketing/components/knowledge-base/index.js
View file
Open in desktop
Expand Up @@ -79,7 +79,7 @@ const KnowledgeBase = ( {
target="_blank"
rel="noopener noreferrer"
>
{ post.image && (
{ !! post.image && (
<div className="woocommerce-marketing-knowledgebase-card__post-img">
<img src={ post.image } alt="" />
</div>
Expand All @@ -89,7 +89,7 @@ const KnowledgeBase = ( {
<p className="woocommerce-marketing-knowledgebase-card__post-meta">
{ __( 'By', 'woocommerce' ) + ' ' }
{ post.author_name }
{ post.author_avatar && (
{ !! post.author_avatar && (
<img
src={ post.author_avatar.replace(
's=96',
Expand Down
2 changes: 1 addition & 1 deletion plugins/woocommerce-admin/client/marketing/coupons/index.js
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ const CouponsOverview = () => {

return (
<div className="woocommerce-marketing-coupons">
{ shouldShowExtensions && (
{ !! shouldShowExtensions && (
<RecommendedExtensions
title={ __(
'Recommended coupon extensions',
Expand Down
6 changes: 3 additions & 3 deletions plugins/woocommerce-admin/client/marketing/overview-multichannel/Campaigns/Campaigns.tsx
View file
Open in desktop
Expand Up @@ -139,7 +139,7 @@ export const Campaigns = () => {
{ el.title }
</Link>
</FlexItem>
{ el.description && (
{ !! el.description && (
<FlexItem className="woocommerce-marketing-campaigns-card__campaign-description">
{ el.description }
</FlexItem>
Expand Down Expand Up @@ -168,14 +168,14 @@ export const Campaigns = () => {
>
{ __( 'Create new campaign', 'woocommerce' ) }
</Button>
{ isModalOpen && (
{ !! isModalOpen && (
<CreateNewCampaignModal
onRequestClose={ () => setModalOpen( false ) }
/>
) }
</CardHeader>
{ getContent() }
{ total && total > perPage && (
{ !! ( total && total > perPage ) && (
<CardFooter className="woocommerce-marketing-campaigns-card__footer">
<Pagination
showPerPagePicker={ false }
Expand Down
2 changes: 1 addition & 1 deletion ...rketing/overview-multichannel/Campaigns/CreateNewCampaignModal/CreateNewCampaignModal.tsx
View file
Open in desktop
Expand Up @@ -105,7 +105,7 @@ export const CreateNewCampaignModal = ( props: CreateCampaignModalProps ) => {
<FlexItem>
{ __( 'Create', 'woocommerce' ) }
</FlexItem>
{ isExternalURL( el.createUrl ) && (
{ !! isExternalURL( el.createUrl ) && (
<FlexItem>
<Icon
icon={ external }
Expand Down
4 changes: 2 additions & 2 deletions plugins/woocommerce-admin/client/marketing/overview-multichannel/Channels/Channels.tsx
View file
Open in desktop
Expand Up @@ -76,7 +76,7 @@ export const Channels: React.FC< ChannelsProps > = ( {
{ /* Recommended channels section. */ }
{ recommendedChannels.length >= 1 && (
<div>
{ hasRegisteredChannels && (
{ !! hasRegisteredChannels && (
<>
<CardDivider />
<CardBody>
Expand All @@ -95,7 +95,7 @@ export const Channels: React.FC< ChannelsProps > = ( {
</CardBody>
</>
) }
{ expanded &&
{ !! expanded &&
recommendedChannels.map( ( el, idx ) => {
return (
<Fragment key={ el.plugin }>
Expand Down
2 changes: 1 addition & 1 deletion ...merce-admin/client/marketing/overview-multichannel/Channels/RegisteredChannelCardBody.tsx
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ export const RegisteredChannelCardBody: React.FC<
registeredChannel.description
) : (
<div className="woocommerce-marketing-registered-channel-description">
{ registeredChannel.syncStatus && (
{ !! registeredChannel.syncStatus && (
<>
<SyncStatus status={ registeredChannel.syncStatus } />
<div className="woocommerce-marketing-registered-channel-description__separator" />
Expand Down
4 changes: 2 additions & 2 deletions plugins/woocommerce-admin/client/marketing/overview-multichannel/LearnMarketing/PostTile.tsx
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ export const PostTile: React.FC< PostTileProps > = ( { post } ) => {
} }
>
<div className="woocommerce-marketing-learn-marketing-card__post-img">
{ post.image && <img src={ post.image } alt="" /> }
{ !! post.image && <img src={ post.image } alt="" /> }
</div>
<div className="woocommerce-marketing-learn-marketing-card__post-title">
{ post.title }
Expand All @@ -37,7 +37,7 @@ export const PostTile: React.FC< PostTileProps > = ( { post } ) => {
// translators: %s: author's name.
sprintf( __( 'By %s', 'woocommerce' ), post.author_name )
}
{ post.author_avatar && (
{ !! post.author_avatar && (
<img
src={ post.author_avatar.replace( 's=96', 's=32' ) }
alt=""
Expand Down
5 changes: 2 additions & 3 deletions ...oocommerce-admin/client/marketing/overview-multichannel/MarketingOverviewMultichannel.tsx
View file
Open in desktop
Expand Up @@ -57,8 +57,7 @@ export const MarketingOverviewMultichannel: React.FC = () => {
return (
<div className="woocommerce-marketing-overview-multichannel">
{ !! dataRegistered?.length && <Campaigns /> }
{ dataRegistered &&
dataRecommended &&
{ !! ( dataRegistered && dataRecommended ) &&
!! ( dataRegistered.length || dataRecommended.length ) && (
<Channels
registeredChannels={ dataRegistered }
Expand All @@ -67,7 +66,7 @@ export const MarketingOverviewMultichannel: React.FC = () => {
/>
) }
<InstalledExtensions />
{ shouldShowExtensions && <DiscoverTools /> }
{ !! shouldShowExtensions && <DiscoverTools /> }
<LearnMarketing />
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion plugins/woocommerce-admin/client/marketing/overview/index.js
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ const MarketingOverview = () => {
<WelcomeCard />
<InstalledExtensions />
<MarketingOverviewSectionSlot />
{ shouldShowExtensions && (
{ !! shouldShowExtensions && (
<RecommendedExtensions category="marketing" />
) }
<KnowledgeBase category="marketing" />
Expand Down
4 changes: 4 additions & 0 deletions plugins/woocommerce/changelog/feature-37175-react-render-boolean-expression
View file
Open in desktop
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Fix React rendering falsy value in marketing page.