Rebase, fix conflicts

projects/js-packages/ai-client/changelog/add-jetpack-ai-general-image-style-selector

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+AI Client: export image generator hook constants

projects/js-packages/ai-client/src/index.ts

@@ -16,6 +16,7 @@ export { default as useAudioTranscription } from './hooks/use-audio-transcriptio
 export { default as useTranscriptionPostProcessing } from './hooks/use-transcription-post-processing/index.js';
 export { default as useAudioValidation } from './hooks/use-audio-validation/index.js';
 export { default as useImageGenerator } from './hooks/use-image-generator/index.js';
+export * from './hooks/use-image-generator/constants.js';
 
 /*
  * Components: Icons

projects/js-packages/components/components/threat-fixer-button/index.tsx

@@ -0,0 +1,135 @@
+import { Button, Text, ActionPopover } from '@automattic/jetpack-components';
+import { CONTACT_SUPPORT_URL, type Threat, fixerStatusIsStale } from '@automattic/jetpack-scan';
+import { ExternalLink } from '@wordpress/components';
+import { createInterpolateElement, useCallback, useMemo, useState } from '@wordpress/element';
+import { __, sprintf } from '@wordpress/i18n';
+import styles from './styles.module.scss';
+
+/**
+ * Threat Fixer Button component.
+ *
+ * @param {object}   props           - Component props.
+ * @param {object}   props.threat    - The threat.
+ * @param {Function} props.onClick   - The onClick function.
+ * @param {string}   props.className - The className.
+ *
+ * @return {JSX.Element} The component.
+ */
+export default function ThreatFixerButton( {
+	threat,
+	className,
+	onClick,
+}: {
+	threat: Threat;
+	onClick: ( items: ( string | number )[] ) => void;
+	className?: string;
+} ): JSX.Element {
+	const [ isPopoverVisible, setIsPopoverVisible ] = useState( false );
+
+	const [ anchor, setAnchor ] = useState( null );
+
+	const children = useMemo( () => {
+		if ( ! threat.fixable ) {
+			return null;
+		}
+		if ( threat.fixer && threat.fixer.error ) {
+			return __( 'Error', 'jetpack' );
+		}
+		if ( threat.fixer && threat.fixer.status === 'in_progress' ) {
+			return __( 'Fixing…', 'jetpack' );
+		}
+		if ( threat.fixable.fixer === 'delete' ) {
+			return __( 'Delete', 'jetpack' );
+		}
+		if ( threat.fixable.fixer === 'update' ) {
+			return __( 'Update', 'jetpack' );
+		}
+		return __( 'Fix', 'jetpack' );
+	}, [ threat.fixable, threat.fixer ] );
+
+	const errorMessage = useMemo( () => {
+		if ( threat.fixer && fixerStatusIsStale( threat.fixer ) ) {
+			return __( 'Fixer is taking longer than expected.', 'jetpack' );
+		}
+
+		if ( threat.fixer && 'error' in threat.fixer && threat.fixer.error ) {
+			return __( 'An error occurred auto-fixing this threat.', 'jetpack' );
+		}
+
+		return null;
+	}, [ threat.fixer ] );
+
+	const handleClick = useCallback(
+		( event: React.MouseEvent ) => {
+			event.stopPropagation();
+			if ( errorMessage && ! isPopoverVisible ) {
+				setIsPopoverVisible( true );
+				return;
+			}
+			onClick( [ threat.id ] );
+		},
+		[ onClick, errorMessage, isPopoverVisible, threat ]
+	);
+
+	const closePopover = useCallback( () => {
+		setIsPopoverVisible( false );
+	}, [] );
+
+	if ( ! threat.fixable ) {
+		return null;
+	}
+
+	return (
+		<div>
+			<Button
+				size="small"
+				weight="regular"
+				variant="secondary"
+				onClick={ handleClick }
+				children={ children }
+				className={ className }
+				disabled={ threat.fixer && threat.fixer.status === 'in_progress' && ! errorMessage }
+				isLoading={ threat.fixer && threat.fixer.status === 'in_progress' }
+				isDestructive={
+					( threat.fixable && threat.fixable.fixer === 'delete' ) ||
+					( threat.fixer && threat.fixer.error ) ||
+					( threat.fixer && fixerStatusIsStale( threat.fixer ) )
+				}
+				style={ { minWidth: '72px' } }
+				ref={ setAnchor }
+			/>
+			{ isPopoverVisible && (
+				<ActionPopover
+					anchor={ anchor }
+					buttonContent={ __( 'Retry Fix', 'jetpack' ) }
+					hideCloseButton={ true }
+					noArrow={ false }
+					onClick={ handleClick }
+					onClose={ closePopover }
+					title={ __( 'Auto-fix error', 'jetpack' ) }
+				>
+					<Text>
+						{ createInterpolateElement(
+							sprintf(
+								/* translators: placeholder is an error message.  */
+								__(
+									'%s Please try again or <supportLink>contact support</supportLink>.',
+									'jetpack'
+								),
+								errorMessage
+							),
+							{
+								supportLink: (
+									<ExternalLink
+										href={ CONTACT_SUPPORT_URL }
+										className={ styles[ 'support-link' ] }
+									/>
+								),
+							}
+						) }
+					</Text>
+				</ActionPopover>
+			) }
+		</div>
+	);
+}

projects/js-packages/components/components/threat-fixer-button/stories/index.stories.tsx

@@ -0,0 +1,30 @@
+import ThreatFixerButton from '../index.js';
+
+export default {
+	title: 'JS Packages/Components/Threat Fixer Button',
+	component: ThreatFixerButton,
+};
+
+export const Default = args => <ThreatFixerButton { ...args } />;
+Default.args = {
+	threat: { fixable: { fixer: 'edit' } },
+	onClick: () => alert( 'Edit fixer callback triggered' ), // eslint-disable-line no-alert
+};
+
+export const Update = args => <ThreatFixerButton { ...args } />;
+Update.args = {
+	threat: { fixable: { fixer: 'update' } },
+	onClick: () => alert( 'Update fixer callback triggered' ), // eslint-disable-line no-alert
+};
+
+export const Delete = args => <ThreatFixerButton { ...args } />;
+Delete.args = {
+	threat: { fixable: { fixer: 'delete' } },
+	onClick: () => alert( 'Delete fixer callback triggered' ), // eslint-disable-line no-alert
+};
+
+export const Loading = args => <ThreatFixerButton { ...args } />;
+Loading.args = {
+	threat: { fixable: { fixer: 'edit' }, fixer: { status: 'in_progress' } },
+	onClick: () => alert( 'Fixer callback triggered' ), // eslint-disable-line no-alert
+};

projects/js-packages/components/components/threat-fixer-button/styles.module.scss

@@ -0,0 +1,9 @@
+.support-link {
+	color: inherit;
+
+	&:focus,
+	&:hover {
+		color: inherit;
+		box-shadow: none;
+	}
+}

projects/js-packages/components/components/threats-data-views/constants.ts

@@ -1,7 +1,5 @@
 import { __ } from '@wordpress/i18n';
 
-export const PAID_PLUGIN_SUPPORT_URL = 'https://jetpack.com/contact-support/?rel=support';
-
 export const THREAT_STATUSES: { value: string; label: string; variant?: 'success' | 'warning' }[] =
 	[
 		{ value: 'current', label: __( 'Active', 'jetpack' ), variant: 'warning' },