Merge branch 'trunk' into update/unbundle-publicize-from-jetpack

Automattic · Aug 3, 2024 · 205f2c3 · 205f2c3
2 parents 2a0f60c + a105a21
commit 205f2c3
Show file tree

Hide file tree

Showing 272 changed files with 9,616 additions and 338 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/projects/js-packages/ai-client/changelog/update-ai-logo-generator-fix-upgrade-message b/projects/js-packages/ai-client/changelog/update-ai-logo-generator-fix-upgrade-message
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+AI Logo Generator: update upgrade message.
diff --git a/projects/js-packages/ai-client/changelog/update-ai-logo-generator-small-ui-fixes b/projects/js-packages/ai-client/changelog/update-ai-logo-generator-small-ui-fixes
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+AI Logo Generator: fix small UI issues.
diff --git a/...ects/js-packages/ai-client/src/logo-generator/components/feature-fetch-failure-screen.tsx b/...ects/js-packages/ai-client/src/logo-generator/components/feature-fetch-failure-screen.tsx
@@ -13,7 +13,7 @@ export const FeatureFetchFailureScreen: React.FC< {
 	onRetry: () => void;
 } > = ( { onCancel, onRetry } ) => {
 	const errorMessage = __(
-		'We are sorry. There was an error loading your Jetpack AI account settings. Please, try again.',
+		'We are sorry. There was an error loading your Jetpack AI plan data. Please, try again.',
 		'jetpack-ai-client'
 	);
 

diff --git a/projects/js-packages/ai-client/src/logo-generator/components/generator-modal.tsx b/projects/js-packages/ai-client/src/logo-generator/components/generator-modal.tsx
@@ -235,7 +235,7 @@ export const GeneratorModal: React.FC< GeneratorModalProps > = ( {
 				/>
 				{ logoAccepted ? (
 					<div className="jetpack-ai-logo-generator__accept">
-						<VisitSiteBanner onVisitBlankTarget={ closeModal } />
+						<VisitSiteBanner />
 						<div className="jetpack-ai-logo-generator__accept-actions">
 							<Button variant="primary" onClick={ closeModal }>
 								{ __( 'Close', 'jetpack-ai-client' ) }

diff --git a/projects/js-packages/ai-client/src/logo-generator/components/upgrade-screen.tsx b/projects/js-packages/ai-client/src/logo-generator/components/upgrade-screen.tsx
@@ -22,7 +22,7 @@ export const UpgradeScreen: React.FC< {
 	const { tracks } = useAnalytics();
 	const { recordEvent: recordTracksEvent } = tracks;
 	const upgradeMessageFeature = __(
-		'Upgrade your Jetpack AI for access to exclusive features, including logo generation. This upgrade will also increase the amount of requests you can use in all AI-powered features.',
+		'The logo generator requires a paid Jetpack AI plan. Upgrade your plan to access exclusive features, including logo generation. The upgrade will also increase the amount of requests you can use in all AI-powered features.',
 		'jetpack-ai-client'
 	);
 

diff --git a/projects/js-packages/ai-client/src/logo-generator/components/visit-site-banner.tsx b/projects/js-packages/ai-client/src/logo-generator/components/visit-site-banner.tsx
@@ -17,7 +17,7 @@ import type React from 'react';
 
 export const VisitSiteBanner: React.FC< {
 	className?: string;
-	onVisitBlankTarget: () => void;
+	onVisitBlankTarget?: () => void;
 } > = ( { className = null, onVisitBlankTarget } ) => {
 	return (
 		<div className={ clsx( 'jetpack-ai-logo-generator-modal-visit-site-banner', className ) }>
@@ -42,7 +42,7 @@ export const VisitSiteBanner: React.FC< {
 						variant="link"
 						href="https://jetpack.com/redirect/?source=logo_generator_learn_more_about_jetpack_ai"
 						target="_blank"
-						onClick={ onVisitBlankTarget }
+						onClick={ onVisitBlankTarget ? onVisitBlankTarget : null }
 					>
 						{ __( 'Learn more about Jetpack AI', 'jetpack-ai-client' ) }
 						<Icon icon={ external } size={ 20 } />

diff --git a/projects/js-packages/components/CHANGELOG.md b/projects/js-packages/components/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### This is a list detailing changes for the Jetpack RNA Components package releases.
 
+## [0.55.4] - 2024-08-01
+### Added
+- Update Welcome Banner and set async site-only connection [#38534]
+
 ## [0.55.3] - 2024-07-30
 ### Changed
 - React: Changing global JSX namespace to React.JSX [#38585]
@@ -1106,6 +1110,7 @@
 ### Changed
 - Update node version requirement to 14.16.1
 
+[0.55.4]: https://github.com/Automattic/jetpack-components/compare/0.55.3...0.55.4
 [0.55.3]: https://github.com/Automattic/jetpack-components/compare/0.55.2...0.55.3
 [0.55.2]: https://github.com/Automattic/jetpack-components/compare/0.55.1...0.55.2
 [0.55.1]: https://github.com/Automattic/jetpack-components/compare/0.55.0...0.55.1

diff --git a/projects/js-packages/components/changelog/update-welcome-banner-connect b/projects/js-packages/components/changelog/update-welcome-banner-connect
diff --git a/projects/js-packages/components/package.json b/projects/js-packages/components/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-components",
-	"version": "0.55.4-alpha",
+	"version": "0.55.4",
 	"description": "Jetpack Components Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",

diff --git a/projects/js-packages/publicize-components/CHANGELOG.md b/projects/js-packages/publicize-components/CHANGELOG.md
@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.58.0] - 2024-08-01
+### Changed
+- Fixup versions [#38612]
+
+### Removed
+- Removed the unused code for image auto-conversion from social store [#38609]
+- Social | Removed the media auto-conversion UI [#38497]
+
+### Fixed
+- Improved broken connection messaging for non-admins [#38639]
+- Social | Fixed and improved media auto conversion notices [#38499]
+
 ## [0.57.0] - 2024-07-29
 ### Added
 - Added mentioning of Manual Sharing [#38411]
@@ -795,6 +807,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Updated package dependencies. [#24470]
 
+[0.58.0]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.57.0...v0.58.0
 [0.57.0]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.56.2...v0.57.0
 [0.56.2]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.56.1...v0.56.2
 [0.56.1]: https://github.com/Automattic/jetpack-publicize-components/compare/v0.56.0...v0.56.1

diff --git a/...ects/js-packages/publicize-components/changelog/add-settings-section-to-social-post-modal b/...ects/js-packages/publicize-components/changelog/add-settings-section-to-social-post-modal
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Social: Added settings section to the social post modal
diff --git a/projects/js-packages/publicize-components/changelog/add-social-feature-flag-management-fixed b/projects/js-packages/publicize-components/changelog/add-social-feature-flag-management-fixed
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Added feature flag management for social
diff --git a/projects/js-packages/publicize-components/changelog/add-social-post-ui-modal b/projects/js-packages/publicize-components/changelog/add-social-post-ui-modal
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Added Social post UI modal and trigger
diff --git a/projects/js-packages/publicize-components/changelog/fix-eslint-no-empty-catch-blocks b/projects/js-packages/publicize-components/changelog/fix-eslint-no-empty-catch-blocks
diff --git a/projects/js-packages/publicize-components/changelog/fix-mastodon-fediverse-creator-og-fatals b/projects/js-packages/publicize-components/changelog/fix-mastodon-fediverse-creator-og-fatals
diff --git a/...-packages/publicize-components/changelog/fix-no-media-notice-for-instagram-when-sig-is-on b/...-packages/publicize-components/changelog/fix-no-media-notice-for-instagram-when-sig-is-on
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix the media validation notice for Instagram when SIG is enabled
diff --git a/...ckages/publicize-components/changelog/remove-social-auto-conversion-logic-from-data-store b/...ckages/publicize-components/changelog/remove-social-auto-conversion-logic-from-data-store
diff --git a/...ackages/publicize-components/changelog/update-social-Remove-the-auto-conversion-toggle-UI b/...ackages/publicize-components/changelog/update-social-Remove-the-auto-conversion-toggle-UI
diff --git a/projects/js-packages/publicize-components/changelog/update-social-auto-conversion-notice b/projects/js-packages/publicize-components/changelog/update-social-auto-conversion-notice
diff --git a/...icize-components/changelog/update-social-improve-broken-connection-message-for-non-admins b/...icize-components/changelog/update-social-improve-broken-connection-message-for-non-admins
diff --git a/projects/js-packages/publicize-components/package.json b/projects/js-packages/publicize-components/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-publicize-components",
-	"version": "0.58.0-alpha",
+	"version": "0.59.0-alpha",
 	"description": "A library of JS components required by the Publicize editor plugin",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/publicize-components/#readme",
 	"bugs": {

diff --git a/projects/js-packages/publicize-components/src/components/form/index.tsx b/projects/js-packages/publicize-components/src/components/form/index.tsx
@@ -14,6 +14,7 @@ import { usePublicizeConfig } from '../../..';
 import useSocialMediaConnections from '../../hooks/use-social-media-connections';
 import { store as socialStore } from '../../social-store';
 import { ThemedConnectionsModal as ManageConnectionsModal } from '../manage-connections-modal';
+import { SocialPostModal } from '../social-post-modal/modal';
 import { AdvancedPlanNudge } from './advanced-plan-nudge';
 import { BrokenConnectionsNotice } from './broken-connections-notice';
 import { ConnectionsList } from './connections-list';
@@ -38,10 +39,11 @@ export default function PublicizeForm() {
 		userConnectionUrl,
 	} = usePublicizeConfig();
 
-	const { useAdminUiV1 } = useSelect( select => {
+	const { useAdminUiV1, featureFlags } = useSelect( select => {
 		const store = select( socialStore );
 		return {
 			useAdminUiV1: store.useAdminUiV1(),
+			featureFlags: store.featureFlags(),
 		};
 	}, [] );
 
@@ -58,6 +60,7 @@ export default function PublicizeForm() {
 					<PanelRow>
 						<ConnectionsList />
 					</PanelRow>
+					{ featureFlags.useEditorPreview ? <SocialPostModal /> : null }
 					<ShareCountInfo />
 					<BrokenConnectionsNotice />
 					<UnsupportedConnectionsNotice />

diff --git a/projects/js-packages/publicize-components/src/components/media-section/index.js b/projects/js-packages/publicize-components/src/components/media-section/index.js
@@ -72,7 +72,10 @@ export default function MediaSection( {
 						mediaDetails={ mediaDetails }
 						onChange={ onChange }
 					/>
-					<ExternalLink href={ getRedirectUrl( 'jetpack-social-media-support-information' ) }>
+					<ExternalLink
+						href={ getRedirectUrl( 'jetpack-social-media-support-information' ) }
+						className={ styles[ 'learn-more' ] }
+					>
 						{ __( 'Learn photo and video best practices', 'jetpack' ) }
 					</ExternalLink>
 				</MediaWrapper>

diff --git a/projects/js-packages/publicize-components/src/components/media-section/styles.module.scss b/projects/js-packages/publicize-components/src/components/media-section/styles.module.scss
@@ -31,3 +31,13 @@
 		margin: 0 0 4px;
 	}
 }
+
+.subtitle {
+	color: var(--jp-gray-40);
+	margin-top: 0;
+}
+
+.learn-more {
+	display: block;
+	margin-top: 1rem;
+}