+ { parsePatch( diff ).map( ( file, fileIndex ) => (
+
+
+ ) ) }
+
+);
+
+export default DiffViewer;
diff --git a/projects/js-packages/components/components/diff-viewer/parse-filename.ts b/projects/js-packages/components/components/diff-viewer/parse-filename.ts
new file mode 100644
index 0000000000000..5e51f8569c06a
--- /dev/null
+++ b/projects/js-packages/components/components/diff-viewer/parse-filename.ts
@@ -0,0 +1,75 @@
+type ParsedFilename = {
+ prefix: string;
+ path: string;
+};
+
+const decompose = ( path: string ): ParsedFilename => {
+ const lastSlash = path.lastIndexOf( '/' );
+
+ return lastSlash > -1
+ ? { prefix: path.slice( 0, lastSlash ), path: path.slice( lastSlash ) }
+ : { prefix: '', path };
+};
+
+/**
+ * Parse the filename from a diff
+ *
+ * Uses a heuristic to return proper file name indicators
+ *
+ * It searches for the longest shared prefix and returns
+ * whatever remains after that. If the paths are identical
+ * it only returns a single filename as we have detected
+ * that the diff compares changes to only one file.
+ *
+ * An exception is made for `a/` and `b/` prefixes often
+ * added by `git` and other utilities to separate the left
+ * from the right when looking at the contents of a single
+ * file over time.
+ *
+ * @param {string} prev - filename of left contents
+ * @param {string} next - filename of right contents
+ *
+ * @return {object} - parsed filename
+ */
+export default function (
+ prev: string,
+ next: string
+): { prev: ParsedFilename; next: ParsedFilename } {
+ // Remove 'a/' and 'b/' prefixes if present
+ const isLikelyPrefixed = prev.startsWith( 'a/' ) && next.startsWith( 'b/' );
+ prev = isLikelyPrefixed ? prev.slice( 2 ) : prev;
+ next = isLikelyPrefixed ? next.slice( 2 ) : next;
+
+ if ( prev === next ) {
+ // Paths are identical
+ const { prefix, path } = decompose( prev );
+ return { prev: { prefix, path }, next: { prefix, path } };
+ }
+
+ // Find longest shared base path ending with a slash
+ const length = Math.max( prev.length, next.length );
+ for ( let i = 0, slash = 0; i < length; i++ ) {
+ if ( prev[ i ] === '/' && next[ i ] === '/' ) {
+ slash = i;
+ }
+
+ if ( prev[ i ] !== next[ i ] ) {
+ return {
+ prev: {
+ prefix: prev.slice( 0, slash ),
+ path: prev.slice( slash ),
+ },
+ next: {
+ prefix: next.slice( 0, slash ),
+ path: next.slice( slash ),
+ },
+ };
+ }
+ }
+
+ // No shared base path
+ return {
+ prev: decompose( prev ),
+ next: decompose( next ),
+ };
+}
diff --git a/projects/js-packages/components/components/diff-viewer/parse-patch.ts b/projects/js-packages/components/components/diff-viewer/parse-patch.ts
new file mode 100644
index 0000000000000..69281bbdc63a3
--- /dev/null
+++ b/projects/js-packages/components/components/diff-viewer/parse-patch.ts
@@ -0,0 +1,212 @@
+type Hunk = {
+ oldStart: number;
+ oldLines: number;
+ newStart: number;
+ newLines: number;
+ lines: string[];
+};
+
+type Index = {
+ index?: string;
+ hunks?: Hunk[];
+ oldFileName?: string;
+ newFileName?: string;
+ oldHeader?: string;
+ newHeader?: string;
+};
+
+/**
+ * Parse Patch
+ *
+ * Adapted from https://github.com/kpdecker/jsdiff/blob/master/src/patch/parse.js
+ *
+ * @param {string} uniDiff - diff string
+ * @return {Array} - array of parsed files
+ */
+export default function parsePatch( uniDiff: string ) {
+ const diffstr = uniDiff.split( /\n/ );
+ const list = [];
+ let i = 0;
+
+ /**
+ * Parse Index
+ */
+ function parseIndex() {
+ const index: Index = {};
+
+ list.push( index );
+
+ // Parse diff metadata
+ while ( i < diffstr.length ) {
+ const line = diffstr[ i ];
+
+ // File header found, end parsing diff metadata
+ if ( /^(---|\+\+\+|@@)\s/.test( line ) ) {
+ break;
+ }
+
+ // Diff index
+ const header = /^(?:Index:|diff(?: -r \w+)+)\s+(.+?)\s*$/.exec( line );
+
+ if ( header ) {
+ index.index = header[ 1 ];
+ }
+
+ i++;
+ }
+
+ // Parse file headers if they are defined. Unified diff requires them, but
+ // there's no technical issues to have an isolated hunk without file header
+ parseFileHeader( index );
+ parseFileHeader( index );
+
+ // Parse hunks
+ index.hunks = [];
+
+ while ( i < diffstr.length ) {
+ const _line = diffstr[ i ];
+
+ if (
+ /^(Index:\s|diff\s|---\s|\+\+\+\s|===================================================================)/.test(
+ _line
+ )
+ ) {
+ break;
+ } else if ( /^@@/.test( _line ) ) {
+ index.hunks.push( parseHunk() );
+ } else if ( _line ) {
+ throw new Error( 'Unknown line ' + ( i + 1 ) + ' ' + JSON.stringify( _line ) );
+ } else {
+ i++;
+ }
+ }
+ }
+
+ /**
+ * Parse File Header
+ *
+ * Parses the --- and +++ headers, if none are found, no lines
+ * are consumed.
+ *
+ * @param {Array} index - array of parsed files
+ * @param {unknown} index.index - index
+ * @param {object[]} index.hunks - hunks
+ */
+ function parseFileHeader( index: Index ) {
+ const fileHeader = /^(---|\+\+\+)\s+(.*)\r?$/.exec( diffstr[ i ] );
+
+ if ( fileHeader ) {
+ const keyPrefix = fileHeader[ 1 ] === '---' ? 'old' : 'new';
+
+ const data = fileHeader[ 2 ].split( '\t', 2 );
+
+ let fileName = data[ 0 ].replace( /\\\\/g, '\\' );
+
+ if ( /^".*"$/.test( fileName ) ) {
+ fileName = fileName.substr( 1, fileName.length - 2 );
+ }
+
+ index[ keyPrefix + 'FileName' ] = fileName;
+
+ index[ keyPrefix + 'Header' ] = ( data[ 1 ] || '' ).trim();
+
+ i++;
+ }
+ }
+
+ /**
+ * Parse Hunk
+ * This assumes that we are at the start of a hunk.
+ *
+ * @return {object} - The parsed hunk.
+ */
+ function parseHunk(): Hunk {
+ const chunkHeaderIndex = i,
+ chunkHeaderLine = diffstr[ i++ ],
+ chunkHeader = chunkHeaderLine.split( /@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/ );
+
+ const hunk = {
+ oldStart: +chunkHeader[ 1 ],
+ oldLines: typeof chunkHeader[ 2 ] === 'undefined' ? 1 : +chunkHeader[ 2 ],
+ newStart: +chunkHeader[ 3 ],
+ newLines: typeof chunkHeader[ 4 ] === 'undefined' ? 1 : +chunkHeader[ 4 ],
+ lines: [],
+ };
+
+ // Unified Diff Format quirk: If the chunk size is 0,
+ // the first number is one lower than one would expect.
+ // https://www.artima.com/weblogs/viewpost.jsp?thread=164293
+
+ if ( hunk.oldLines === 0 ) {
+ hunk.oldStart += 1;
+ }
+
+ if ( hunk.newLines === 0 ) {
+ hunk.newStart += 1;
+ }
+
+ let addCount = 0,
+ removeCount = 0,
+ _diffstr$i;
+ for (
+ ;
+ i < diffstr.length &&
+ ( removeCount < hunk.oldLines ||
+ addCount < hunk.newLines ||
+ ( ( _diffstr$i = diffstr[ i ] ) !== null &&
+ _diffstr$i !== void 0 &&
+ _diffstr$i.startsWith( '\\' ) ) );
+ i++
+ ) {
+ const operation =
+ diffstr[ i ].length === 0 && i !== diffstr.length - 1 ? ' ' : diffstr[ i ][ 0 ];
+
+ if ( operation === '+' || operation === '-' || operation === ' ' || operation === '\\' ) {
+ hunk.lines.push( diffstr[ i ] );
+
+ if ( operation === '+' ) {
+ addCount++;
+ } else if ( operation === '-' ) {
+ removeCount++;
+ } else if ( operation === ' ' ) {
+ addCount++;
+ removeCount++;
+ }
+ } else {
+ throw new Error(
+ `Hunk at line ${ chunkHeaderIndex + 1 } contained invalid line ${ diffstr[ i ] }`
+ );
+ }
+ }
+
+ // Handle the empty block count case
+ if ( ! addCount && hunk.newLines === 1 ) {
+ hunk.newLines = 0;
+ }
+
+ if ( ! removeCount && hunk.oldLines === 1 ) {
+ hunk.oldLines = 0;
+ }
+
+ // Perform sanity checking
+ if ( addCount !== hunk.newLines ) {
+ throw new Error(
+ 'Added line count did not match for hunk at line ' + ( chunkHeaderIndex + 1 )
+ );
+ }
+
+ if ( removeCount !== hunk.oldLines ) {
+ throw new Error(
+ 'Removed line count did not match for hunk at line ' + ( chunkHeaderIndex + 1 )
+ );
+ }
+
+ return hunk;
+ }
+
+ while ( i < diffstr.length ) {
+ parseIndex();
+ }
+
+ return list;
+}
diff --git a/projects/js-packages/components/components/diff-viewer/stories/index.stories.tsx b/projects/js-packages/components/components/diff-viewer/stories/index.stories.tsx
new file mode 100644
index 0000000000000..4f986981f9761
--- /dev/null
+++ b/projects/js-packages/components/components/diff-viewer/stories/index.stories.tsx
@@ -0,0 +1,39 @@
+/* eslint-disable react/react-in-jsx-scope */
+import React from 'react';
+import DiffViewer from '..';
+
+export default {
+ title: 'JS Packages/Components/Diff Viewer',
+ component: DiffViewer,
+};
+
+const diff = `diff --git a/package.json b/package.json
+Index: a31e51f..c3b21a1 100644
+--- a/package.json
++++ b/package.json
+@@ -1,7 +1,7 @@
+ {
+ "name": "hello-world",
+- "version": "1.0.0",
++ "version": "1.0.1",
+ "description": "Hello, World!",
+- "main": "index.js",
++ "main": "index.ts",
+ "scripts": {
+- "start": "node index.js"
++ "start": "node index.ts"
+
+diff --git a/src/index.js b/src/index.ts
+Index: 17c882a..d3f041b 100644
+--- a/src/index.js
++++ b/src/index.ts
+@@ -0,0 +1,1 @@
++console.log( 'Hello, world!' );`;
+
+const Template = args =>
+ { filename( file ) }
+
+
+
+
+ { file.hunks.map( ( hunk, hunkIndex ) => {
+ let lineOffset = 0;
+ return hunk.lines.map( ( line, index ) => (
+
+
+ { line[ 0 ] === '+' ? '\u00a0' : hunk.oldStart + lineOffset++ }
+
+ ) );
+ } ) }
+
+ { file.hunks.map( ( hunk, hunkIndex ) => {
+ let lineOffset = 0;
+ return hunk.lines.map( ( line, index ) => (
+
+
+ { line[ 0 ] === '-' ? '\u00a0' : hunk.newStart + lineOffset++ }
+
+ ) );
+ } ) }
+
+ { file.hunks.map( ( hunk, hunkIndex ) =>
+ hunk.lines.map( ( line, index ) => {
+ const output = line.slice( 1 ).replace( /^\s*$/, '\u00a0' );
+ const key = `${ hunkIndex }-${ index }`;
+
+ switch ( line[ 0 ] ) {
+ case ' ':
+ return { output };
+
+ case '+':
+ return { output };
+
+ default:
+ return undefined;
+ }
+ } )
+ ) }
+
+ { output }
;
+
+ case '-':
+ return
{ ! connection.profile_link ? (
- { connection.display_name }
+
+ { connection.display_name || connection.external_name }
+
) : (
- { connection.display_name || connection.external_display }
+ { connection.display_name || connection.external_display || connection.external_name }
) }
{ isUpdating ? (
diff --git a/projects/js-packages/publicize-components/src/components/connection-management/reconnect.tsx b/projects/js-packages/publicize-components/src/components/connection-management/reconnect.tsx
index 107fdc5240c10..d6e11e80cf36e 100644
--- a/projects/js-packages/publicize-components/src/components/connection-management/reconnect.tsx
+++ b/projects/js-packages/publicize-components/src/components/connection-management/reconnect.tsx
@@ -58,11 +58,7 @@ export function Reconnect( { connection, service, variant = 'link' }: ReconnectP
return;
}
- await setReconnectingAccount(
- // Join service name and external ID
- // just in case the external ID alone is not unique.
- `${ connection.service_name }:${ connection.external_id }`
- );
+ await setReconnectingAccount( connection );
const formData = new FormData();
@@ -70,8 +66,19 @@ export function Reconnect( { connection, service, variant = 'link' }: ReconnectP
formData.set( 'instance', connection.external_display );
}
- requestAccess( formData );
- }, [ connection, deleteConnectionById, requestAccess, service.ID, setReconnectingAccount ] );
+ if ( service.ID === 'bluesky' ) {
+ openConnectionsModal();
+ } else {
+ requestAccess( formData );
+ }
+ }, [
+ connection,
+ deleteConnectionById,
+ openConnectionsModal,
+ requestAccess,
+ service.ID,
+ setReconnectingAccount,
+ ] );
if ( ! connection.can_disconnect ) {
return null;
diff --git a/projects/js-packages/publicize-components/src/components/form/broken-connections-notice.tsx b/projects/js-packages/publicize-components/src/components/form/broken-connections-notice.tsx
index de9db8ac52020..371b847fac919 100644
--- a/projects/js-packages/publicize-components/src/components/form/broken-connections-notice.tsx
+++ b/projects/js-packages/publicize-components/src/components/form/broken-connections-notice.tsx
@@ -26,7 +26,7 @@ export const BrokenConnectionsNotice: React.FC = () => {
);
} );
- const { connectionsAdminUrl } = usePublicizeConfig();
+ const { connectionsPageUrl } = usePublicizeConfig();
const { useAdminUiV1 } = getSocialScriptData().feature_flags;
@@ -39,7 +39,7 @@ export const BrokenConnectionsNotice: React.FC = () => {
className={ styles[ 'broken-connection-btn' ] }
/>
) : (
-
{ __(
'To share to Instagram, add an image/video, or enable Social Image Generator.',
diff --git a/projects/js-packages/publicize-components/src/components/form/settings-button.tsx b/projects/js-packages/publicize-components/src/components/form/settings-button.tsx
index ec3a8d8ccd617..7527379232f5f 100644
--- a/projects/js-packages/publicize-components/src/components/form/settings-button.tsx
+++ b/projects/js-packages/publicize-components/src/components/form/settings-button.tsx
@@ -33,7 +33,7 @@ export function SettingsButton( { label, variant = 'primary' }: SettingsButtonPr
};
}, [] );
const { openConnectionsModal } = useDispatch( store );
- const { connectionsAdminUrl } = usePublicizeConfig();
+ const { connectionsPageUrl } = usePublicizeConfig();
const text = label || __( 'Manage connections', 'jetpack' );
const hasConnections = connections.length > 0;
@@ -48,7 +48,7 @@ export function SettingsButton( { label, variant = 'primary' }: SettingsButtonPr
{ text }
) : (
-
+
{ text }
);
diff --git a/projects/js-packages/publicize-components/src/components/form/share-post-form.tsx b/projects/js-packages/publicize-components/src/components/form/share-post-form.tsx
index 92794ff64f661..11ecd5e45aa23 100644
--- a/projects/js-packages/publicize-components/src/components/form/share-post-form.tsx
+++ b/projects/js-packages/publicize-components/src/components/form/share-post-form.tsx
@@ -1,5 +1,6 @@
-import { usePublicizeConfig } from '../../..';
+import { siteHasFeature } from '@automattic/jetpack-script-data';
import useSocialMediaMessage from '../../hooks/use-social-media-message';
+import { features } from '../../utils/constants';
import MediaSection from '../media-section';
import MessageBoxControl from '../message-box-control';
@@ -16,8 +17,6 @@ type SharePostFormProps = {
export const SharePostForm: React.FC< SharePostFormProps > = ( { analyticsData = null } ) => {
const { message, updateMessage, maxLength } = useSocialMediaMessage();
- const { isEnhancedPublishingEnabled } = usePublicizeConfig();
-
return (
<>
= ( { analyticsData =
message={ message }
analyticsData={ analyticsData }
/>
- { isEnhancedPublishingEnabled &&
diff --git a/projects/js-packages/publicize-components/src/components/manage-connections-modal/confirmation-form/index.tsx b/projects/js-packages/publicize-components/src/components/manage-connections-modal/confirmation-form/index.tsx
index 4eecc6d050a37..6ffc93c8ca59b 100644
--- a/projects/js-packages/publicize-components/src/components/manage-connections-modal/confirmation-form/index.tsx
+++ b/projects/js-packages/publicize-components/src/components/manage-connections-modal/confirmation-form/index.tsx
@@ -90,7 +90,7 @@ export function ConfirmationForm( { keyringResult, onComplete, isAdmin }: Confir
// If user account is supported, add it to the list
if ( ! service.external_users_only ) {
options.push( {
- label: keyringResult.external_display,
+ label: keyringResult.external_display || keyringResult.external_name,
value: keyringResult.external_ID,
profile_picture: keyringResult.external_profile_picture,
} );
@@ -150,7 +150,7 @@ export function ConfirmationForm( { keyringResult, onComplete, isAdmin }: Confir
);
if ( reconnectingAccount ) {
- setReconnectingAccount( '' );
+ setReconnectingAccount( undefined );
}
// Do not await the connection creation to unblock the UI
@@ -215,7 +215,8 @@ export function ConfirmationForm( { keyringResult, onComplete, isAdmin }: Confir
// If we are reconnecting an account, preselect it,
// otherwise, preselect the first account
const defaultChecked = reconnectingAccount
- ? reconnectingAccount === `${ service?.ID }:${ option.value }`
+ ? reconnectingAccount.service_name === service?.ID &&
+ reconnectingAccount.external_id === option.value
: index === 0;
return (
diff --git a/projects/js-packages/publicize-components/src/components/manage-connections-modal/index.tsx b/projects/js-packages/publicize-components/src/components/manage-connections-modal/index.tsx
index 129dcbc54d9ba..336597e2dcaf2 100644
--- a/projects/js-packages/publicize-components/src/components/manage-connections-modal/index.tsx
+++ b/projects/js-packages/publicize-components/src/components/manage-connections-modal/index.tsx
@@ -24,14 +24,15 @@ export const ManageConnectionsModal = () => {
};
}, [] );
- const { setKeyringResult, closeConnectionsModal } = useDispatch( store );
+ const { setKeyringResult, closeConnectionsModal, setReconnectingAccount } = useDispatch( store );
const [ isSmall ] = useBreakpointMatch( 'sm' );
const closeModal = useCallback( () => {
setKeyringResult( null );
+ setReconnectingAccount( undefined );
closeConnectionsModal();
- }, [ closeConnectionsModal, setKeyringResult ] );
+ }, [ closeConnectionsModal, setKeyringResult, setReconnectingAccount ] );
const hasKeyringResult = Boolean( keyringResult?.ID );
diff --git a/projects/js-packages/publicize-components/src/components/services/custom-inputs.tsx b/projects/js-packages/publicize-components/src/components/services/custom-inputs.tsx
index 4064facfbf9ed..95e02ed8c8729 100644
--- a/projects/js-packages/publicize-components/src/components/services/custom-inputs.tsx
+++ b/projects/js-packages/publicize-components/src/components/services/custom-inputs.tsx
@@ -1,6 +1,9 @@
+import { Alert } from '@automattic/jetpack-components';
import { ExternalLink } from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
import { createInterpolateElement, useId } from '@wordpress/element';
import { __, _x } from '@wordpress/i18n';
+import { store } from '../../social-store';
import { SupportedService } from '../services/use-supported-services';
import styles from './style.module.scss';
@@ -17,6 +20,8 @@ type CustomInputsProps = {
export function CustomInputs( { service }: CustomInputsProps ) {
const id = useId();
+ const reconnectingAccount = useSelect( select => select( store ).getReconnectingAccount(), [] );
+
if ( 'mastodon' === service.ID ) {
return (
-
@@ -58,6 +63,11 @@ export function CustomInputs( { service }: CustomInputsProps ) {
required
type="text"
name="handle"
+ defaultValue={
+ reconnectingAccount?.service_name === 'bluesky'
+ ? reconnectingAccount?.external_name
+ : undefined
+ }
autoComplete="off"
autoCapitalize="off"
autoCorrect="off"
@@ -93,6 +103,11 @@ export function CustomInputs( { service }: CustomInputsProps ) {
aria-describedby={ `${ id }-password-description` }
placeholder={ 'xxxx-xxxx-xxxx-xxxx' }
/>
+ { reconnectingAccount?.service_name === 'bluesky' && (
+
+ { __( 'Please provide an app password to fix the connection.', 'jetpack' ) }
+
+ ) }
);
diff --git a/projects/js-packages/publicize-components/src/components/services/service-item.tsx b/projects/js-packages/publicize-components/src/components/services/service-item.tsx
index 2020e883690a1..00754aa1a1e38 100644
--- a/projects/js-packages/publicize-components/src/components/services/service-item.tsx
+++ b/projects/js-packages/publicize-components/src/components/services/service-item.tsx
@@ -1,6 +1,6 @@
import { Button, useBreakpointMatch } from '@automattic/jetpack-components';
import { Panel, PanelBody } from '@wordpress/components';
-import { useReducer } from '@wordpress/element';
+import { useEffect, useReducer, useRef } from '@wordpress/element';
import { __, _x } from '@wordpress/i18n';
import { Icon, chevronDown, chevronUp } from '@wordpress/icons';
import { ConnectForm } from './connect-form';
@@ -8,7 +8,9 @@ import { ServiceItemDetails, ServicesItemDetailsProps } from './service-item-det
import { ServiceStatus } from './service-status';
import styles from './style.module.scss';
-export type ServicesItemProps = ServicesItemDetailsProps;
+export type ServicesItemProps = ServicesItemDetailsProps & {
+ isPanelDefaultOpen?: boolean;
+};
/**
* Service item component
@@ -17,10 +19,22 @@ export type ServicesItemProps = ServicesItemDetailsProps;
*
* @return {import('react').ReactNode} Service item component
*/
-export function ServiceItem( { service, serviceConnections }: ServicesItemProps ) {
+export function ServiceItem( {
+ service,
+ serviceConnections,
+ isPanelDefaultOpen,
+}: ServicesItemProps ) {
const [ isSmall ] = useBreakpointMatch( 'sm' );
- const [ isPanelOpen, togglePanel ] = useReducer( state => ! state, false );
+ const [ isPanelOpen, togglePanel ] = useReducer( state => ! state, isPanelDefaultOpen );
+ const panelRef = useRef< HTMLDivElement >( null );
+
+ useEffect( () => {
+ if ( isPanelDefaultOpen ) {
+ panelRef.current?.scrollIntoView( { block: 'center', behavior: 'smooth' } );
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [] );
const areCustomInputsVisible = isPanelOpen && service.needsCustomInputs;
@@ -94,7 +108,7 @@ export function ServiceItem( { service, serviceConnections }: ServicesItemProps
-
{ supportedServices.map( service => (
-
-
+
) ) }
+
+ ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentNullableInternal', 'PhanTypeMismatchDefault', 'PhanUndeclaredClassMethod', 'PhanUndeclaredClassReference', 'PhanUndeclaredConstant'],
'app/lib/minify/functions-service.php' => ['PhanImpossibleTypeComparison', 'PhanPluginDuplicateConditionalNullCoalescing', 'PhanPluginNeverReturnFunction', 'PhanPluginUseReturnValueInternalKnown', 'PhanPossiblyUndeclaredVariable', 'PhanRedundantCondition', 'PhanTypeMismatchArgumentInternal', 'PhanTypeMismatchArgumentNullableInternal'],
'app/modules/Modules_Setup.php' => ['PhanTypeMismatchPropertyDefault'],
- 'app/modules/image-guide/Image_Guide.php' => ['PhanPluginSimplifyExpressionBool'],
'app/modules/image-guide/Image_Guide_Proxy.php' => ['PhanPluginDuplicateConditionalNullCoalescing'],
'app/modules/image-size-analysis/data-sync/Image_Size_Analysis_Action_Fix.php' => ['PhanPossiblyUndeclaredVariable', 'PhanRedundantCondition'],
'app/modules/optimizations/critical-css/CSS_Proxy.php' => ['PhanPluginDuplicateConditionalNullCoalescing'],
diff --git a/projects/plugins/boost/CHANGELOG.md b/projects/plugins/boost/CHANGELOG.md
index 4d42b4417e2b9..3069300457b16 100644
--- a/projects/plugins/boost/CHANGELOG.md
+++ b/projects/plugins/boost/CHANGELOG.md
@@ -5,7 +5,7 @@ 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).
-## [3.5.2-beta] - 2024-10-10
+## [3.5.2] - 2024-10-15
### Changed
- Deferred JS: Exclude all scripts produced by a shortcode. [#39616]
- General: Sync Boost's Getting Started page with My Jetpack's version. [#39130]
@@ -524,7 +524,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- First public alpha release
-[3.5.2-beta]: https://github.com/Automattic/jetpack-boost-production/compare/3.5.1...3.5.2-beta
+[3.5.2]: https://github.com/Automattic/jetpack-boost-production/compare/3.5.1...3.5.2
[3.5.1]: https://github.com/Automattic/jetpack-boost-production/compare/3.5.0...3.5.1
[3.5.0]: https://github.com/Automattic/jetpack-boost-production/compare/3.4.9...3.5.0
[3.4.9]: https://github.com/Automattic/jetpack-boost-production/compare/3.4.8...3.4.9
diff --git a/projects/plugins/boost/app/features/setup-prompt/Setup_Prompt.php b/projects/plugins/boost/app/features/setup-prompt/Setup_Prompt.php
deleted file mode 100644
index c7c02c6961c25..0000000000000
--- a/projects/plugins/boost/app/features/setup-prompt/Setup_Prompt.php
+++ /dev/null
@@ -1,61 +0,0 @@
-get() === false || $this->is_banner_dismissed() ) {
- return;
- }
-
- add_action( 'admin_notices', array( $this, 'connection_prompt' ) );
- add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
- add_action( 'admin_footer', array( $this, 'add_dismiss_script' ) );
- }
-
- public function enqueue_scripts() {
- wp_enqueue_style( 'jetpack-boost-admin-banner', plugins_url( '../../assets/dist/admin-banner.css', __FILE__ ), array(), JETPACK_BOOST_VERSION );
- }
-
- public function connection_prompt() {
- include __DIR__ . '/_inc/banner.php';
- }
-
- public function add_dismiss_script() {
- include __DIR__ . '/_inc/dismiss-script.php';
- }
-
- private function is_banner_dismissed() {
- return get_option( self::OPTION_KEY, false );
- }
-
- /**
- * Hides the boost promo banner on dismiss
- *
- * @return never
- */
- public function dismiss_setup_banner() {
- check_ajax_referer( self::NONCE_ACTION, 'nonce' );
- update_option( self::OPTION_KEY, true, false );
- exit();
- }
-}
diff --git a/projects/plugins/boost/app/features/setup-prompt/_inc/banner.php b/projects/plugins/boost/app/features/setup-prompt/_inc/banner.php
deleted file mode 100644
index 702452062d99b..0000000000000
--- a/projects/plugins/boost/app/features/setup-prompt/_inc/banner.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
-+ get_error_message() ); + ?> +
+
-
-
-
-
diff --git a/projects/plugins/boost/app/features/setup-prompt/_inc/dismiss-script.php b/projects/plugins/boost/app/features/setup-prompt/_inc/dismiss-script.php
deleted file mode 100644
index 4f0406eed8a62..0000000000000
--- a/projects/plugins/boost/app/features/setup-prompt/_inc/dismiss-script.php
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/projects/plugins/boost/app/lib/critical-css/source-providers/providers/WP_Core_Provider.php b/projects/plugins/boost/app/lib/critical-css/source-providers/providers/WP_Core_Provider.php
index e2b63769a6784..68445b4031fbb 100644
--- a/projects/plugins/boost/app/lib/critical-css/source-providers/providers/WP_Core_Provider.php
+++ b/projects/plugins/boost/app/lib/critical-css/source-providers/providers/WP_Core_Provider.php
@@ -43,8 +43,8 @@ public static function get_critical_source_urls( $context_posts = array() ) {
if ( ! empty( $permalink ) ) {
$urls['posts_page'] = array( $permalink );
}
- } else {
- $urls['posts_page'] = (array) home_url( '/' );
+ } elseif ( ! $front_page ) {
+ $urls['posts_page'] = array( home_url( '/' ) );
}
return $urls;
diff --git a/projects/plugins/boost/app/modules/image-guide/Image_Guide.php b/projects/plugins/boost/app/modules/image-guide/Image_Guide.php
index 9360a6b25efef..ce2e23fe9197e 100644
--- a/projects/plugins/boost/app/modules/image-guide/Image_Guide.php
+++ b/projects/plugins/boost/app/modules/image-guide/Image_Guide.php
@@ -9,15 +9,12 @@
class Image_Guide implements Pluggable {
public function setup() {
- // phpcs:ignore WordPress.Security.NonceVerification.Recommended
- $override = isset( $_GET['jb-debug-ig'] );
-
- if ( is_admin() || is_user_logged_in() || current_user_can( 'manage_options' ) ) {
+ if ( is_user_logged_in() && current_user_can( 'manage_options' ) ) {
Image_Guide_Proxy::init();
}
// Show the UI only when the user is logged in, with sufficient permissions and isn't looking at the dashboard.
- if ( true !== $override && ( is_admin() || ! is_user_logged_in() || ! current_user_can( 'manage_options' ) ) ) {
+ if ( is_admin() || ! is_user_logged_in() || ! current_user_can( 'manage_options' ) ) {
return;
}
diff --git a/projects/plugins/boost/changelog/backport-3.5.2-changes b/projects/plugins/boost/changelog/backport-3.5.2-changes
new file mode 100644
index 0000000000000..2dfedd8b13b1f
--- /dev/null
+++ b/projects/plugins/boost/changelog/backport-3.5.2-changes
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Backport changes from 3.5.2 release.
+
+
diff --git a/projects/plugins/boost/changelog/fix-sync-filter-null-array b/projects/plugins/boost/changelog/fix-sync-filter-null-array
new file mode 100644
index 0000000000000..3f56c90b3a7bf
--- /dev/null
+++ b/projects/plugins/boost/changelog/fix-sync-filter-null-array
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Sync: update filter parameter to avoid conflicts with other plugins.
+
+
diff --git a/projects/plugins/boost/changelog/remove-image-guide-override b/projects/plugins/boost/changelog/remove-image-guide-override
new file mode 100644
index 0000000000000..35c10bab98c1a
--- /dev/null
+++ b/projects/plugins/boost/changelog/remove-image-guide-override
@@ -0,0 +1,4 @@
+Significance: minor
+Type: removed
+
+Image Guide: Remove URL parameter based override.
diff --git a/projects/plugins/boost/changelog/remove-setup-prompt b/projects/plugins/boost/changelog/remove-setup-prompt
new file mode 100644
index 0000000000000..efe8af0a118e6
--- /dev/null
+++ b/projects/plugins/boost/changelog/remove-setup-prompt
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Removed unused code
+
+
diff --git a/projects/plugins/boost/changelog/update-ccss-core-providers b/projects/plugins/boost/changelog/update-ccss-core-providers
new file mode 100644
index 0000000000000..527e9511c0c8b
--- /dev/null
+++ b/projects/plugins/boost/changelog/update-ccss-core-providers
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Critical CSS: Make the list of critical CSS URLs more efficient.
diff --git a/projects/plugins/boost/changelog/update-tested-to-6-7 b/projects/plugins/boost/changelog/update-tested-to-6-7
new file mode 100644
index 0000000000000..9c1d5b4fabb5f
--- /dev/null
+++ b/projects/plugins/boost/changelog/update-tested-to-6-7
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+General: indicate compatibility with the upcoming version of WordPress - 6.7.
diff --git a/projects/plugins/boost/composer.json b/projects/plugins/boost/composer.json
index 1f93287f385f9..c07f0a75a493f 100644
--- a/projects/plugins/boost/composer.json
+++ b/projects/plugins/boost/composer.json
@@ -3,7 +3,7 @@
"description": "Boost your WordPress site's performance, from the creators of Jetpack",
"type": "library",
"license": "GPL-2.0-or-later",
- "version": "3.5.2-beta",
+ "version": "3.5.2",
"authors": [
{
"name": "Automattic, Inc.",
@@ -74,7 +74,7 @@
"platform": {
"ext-intl": "0.0.0"
},
- "autoloader-suffix": "b1e77e6231d50e7663f84529b6a3dfda_jetpack_boostⓥ3_5_2_beta",
+ "autoloader-suffix": "b1e77e6231d50e7663f84529b6a3dfda_jetpack_boostⓥ3_5_2",
"allow-plugins": {
"roots/wordpress-core-installer": true,
"automattic/jetpack-autoloader": true,
diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock
index b16ccf509b8aa..3b6fc7a807989 100644
--- a/projects/plugins/boost/composer.lock
+++ b/projects/plugins/boost/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "ef9bdede176e9ae0f99bac7c8e4de09a",
+ "content-hash": "aa37384bded5cf285343140269233ca2",
"packages": [
{
"name": "automattic/jetpack-a8c-mc-stats",
diff --git a/projects/plugins/boost/jetpack-boost.php b/projects/plugins/boost/jetpack-boost.php
index d75ac3de43503..72e55cbb4abbc 100644
--- a/projects/plugins/boost/jetpack-boost.php
+++ b/projects/plugins/boost/jetpack-boost.php
@@ -9,7 +9,7 @@
* Plugin Name: Jetpack Boost
* Plugin URI: https://jetpack.com/boost
* Description: Boost your WordPress site's performance, from the creators of Jetpack
- * Version: 3.5.2-beta
+ * Version: 3.5.2
* Author: Automattic - Jetpack Site Speed team
* Author URI: https://jetpack.com/boost/
* License: GPL-2.0+
@@ -29,7 +29,7 @@
die;
}
-define( 'JETPACK_BOOST_VERSION', '3.5.2-beta' );
+define( 'JETPACK_BOOST_VERSION', '3.5.2' );
define( 'JETPACK_BOOST_SLUG', 'jetpack-boost' );
if ( ! defined( 'JETPACK_BOOST_CLIENT_NAME' ) ) {
diff --git a/projects/plugins/boost/package.json b/projects/plugins/boost/package.json
index a4e58afac616e..9c3124c796fab 100644
--- a/projects/plugins/boost/package.json
+++ b/projects/plugins/boost/package.json
@@ -1,6 +1,6 @@
{
"name": "jetpack-boost",
- "version": "3.5.2-beta",
+ "version": "3.5.2",
"description": "Boost your WordPress site's performance, from the creators of Jetpack",
"directories": {
"test": "tests"
diff --git a/projects/plugins/boost/readme.txt b/projects/plugins/boost/readme.txt
index e359cc797035a..fde356fc07b00 100644
--- a/projects/plugins/boost/readme.txt
+++ b/projects/plugins/boost/readme.txt
@@ -3,9 +3,9 @@ Contributors: automattic, xwp, adnan007, bjorsch, danwalmsley, davidlonjon, dili
Donate link: https://automattic.com
Tags: performance, speed, web vitals, critical css, cache
Requires at least: 6.5
-Tested up to: 6.6
+Tested up to: 6.7
Requires PHP: 7.0
-Stable tag: 3.5.1
+Stable tag: 3.5.2
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -183,7 +183,7 @@ If you run into compatibility issues, please do let us know. You can drop us a l
2. Jetpack Boost Speed Improvement
== Changelog ==
-### 3.5.2-beta - 2024-10-10
+### 3.5.2 - 2024-10-15
#### Changed
- Deferred JS: Exclude all scripts produced by a shortcode.
- General: Sync Boost's Getting Started page with My Jetpack's version.
diff --git a/projects/plugins/classic-theme-helper-plugin/changelog/update-tested-to-6-7 b/projects/plugins/classic-theme-helper-plugin/changelog/update-tested-to-6-7
new file mode 100644
index 0000000000000..9c1d5b4fabb5f
--- /dev/null
+++ b/projects/plugins/classic-theme-helper-plugin/changelog/update-tested-to-6-7
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+General: indicate compatibility with the upcoming version of WordPress - 6.7.
diff --git a/projects/plugins/classic-theme-helper-plugin/readme.txt b/projects/plugins/classic-theme-helper-plugin/readme.txt
index d4c1568fc21a6..ae28b2f61398f 100644
--- a/projects/plugins/classic-theme-helper-plugin/readme.txt
+++ b/projects/plugins/classic-theme-helper-plugin/readme.txt
@@ -3,7 +3,7 @@ Contributors: automattic,
Tags: jetpack, stuff
Requires at least: 6.5
Requires PHP: 7.0
-Tested up to: 6.6
+Tested up to: 6.7
Stable tag: 0.1.0-alpha
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
diff --git a/projects/plugins/crm/changelog/update-tested-to-6-7 b/projects/plugins/crm/changelog/update-tested-to-6-7
new file mode 100644
index 0000000000000..9c1d5b4fabb5f
--- /dev/null
+++ b/projects/plugins/crm/changelog/update-tested-to-6-7
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+General: indicate compatibility with the upcoming version of WordPress - 6.7.
diff --git a/projects/plugins/crm/readme.txt b/projects/plugins/crm/readme.txt
index fa19d69208f33..85fc40e13a5de 100644
--- a/projects/plugins/crm/readme.txt
+++ b/projects/plugins/crm/readme.txt
@@ -1,7 +1,7 @@
=== Jetpack CRM - Clients, Leads, Invoices, Billing, Email Marketing, & Automation ===
Contributors: automattic, kallehauge, cleacos, diegogarciarodrigues, bradshawtm, wpkaren, robertf4, woodyhayday, mikemayhem3030
Tags: CRM, Invoice, Woocommerce CRM, Clients, Lead Generation, contacts, customers, billing, email marketing, Marketing Automation, contact form, automations
-Tested up to: 6.6
+Tested up to: 6.7
Stable tag: 6.4.2
Requires at least: 6.0
Requires PHP: 7.4
diff --git a/projects/plugins/inspect/changelog/update-tested-to-6-7 b/projects/plugins/inspect/changelog/update-tested-to-6-7
new file mode 100644
index 0000000000000..9c1d5b4fabb5f
--- /dev/null
+++ b/projects/plugins/inspect/changelog/update-tested-to-6-7
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+General: indicate compatibility with the upcoming version of WordPress - 6.7.
diff --git a/projects/plugins/inspect/readme.txt b/projects/plugins/inspect/readme.txt
index 8047dad7d5d0f..d3a735ec12689 100644
--- a/projects/plugins/inspect/readme.txt
+++ b/projects/plugins/inspect/readme.txt
@@ -3,7 +3,7 @@ Contributors: automattic,
Tags: jetpack, stuff
Requires at least: 6.5
Requires PHP: 7.0
-Tested up to: 6.6
+Tested up to: 6.7
Stable tag: 1.0.0-alpha
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
diff --git a/projects/plugins/jetpack/.phan/baseline.php b/projects/plugins/jetpack/.phan/baseline.php
index 73b08dec3ed91..7120701294027 100644
--- a/projects/plugins/jetpack/.phan/baseline.php
+++ b/projects/plugins/jetpack/.phan/baseline.php
@@ -178,7 +178,7 @@
'extensions/blocks/blog-stats/blog-stats.php' => ['PhanTypeMismatchReturnProbablyReal'],
'extensions/blocks/blogroll/blogroll-item/blogroll-item.php' => ['PhanPluginDuplicateConditionalNullCoalescing'],
'extensions/blocks/calendly/calendly.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchReturnProbablyReal'],
- 'extensions/blocks/contact-info/class-jetpack-contact-info-block.php' => ['PhanTypeMismatchReturn'],
+ 'extensions/blocks/contact-info/contact-info.php' => ['PhanTypeMismatchReturn'],
'extensions/blocks/cookie-consent/cookie-consent.php' => ['PhanParamTooMany'],
'extensions/blocks/donations/donations.php' => ['PhanTypeMismatchArgument'],
'extensions/blocks/gif/gif.php' => ['PhanPluginDuplicateConditionalNullCoalescing', 'PhanTypeMismatchReturnProbablyReal'],
diff --git a/projects/plugins/jetpack/CHANGELOG.md b/projects/plugins/jetpack/CHANGELOG.md
index 8382d4c1241cb..69f50357e0587 100644
--- a/projects/plugins/jetpack/CHANGELOG.md
+++ b/projects/plugins/jetpack/CHANGELOG.md
@@ -2,6 +2,68 @@
### This is a list detailing changes for all Jetpack releases.
+## 14.0-a.7 - 2024-10-21
+### Enhancements
+- Newsletters: Add an email preview option to the preview menu. [#39782]
+- Newsletters: Allow skipping newsletter modals with a URL query param. [#39644]
+
+### Improved compatibility
+- General: Ensure notice displays without errors when running an old version of WordPress. [#39745]
+- Plugin action links filters: Update parameter to avoid conflicts with other plugins. [#39681]
+
+### Bug fixes
+- Map Block: Fix issue where blocks placed underneath would overlap with the map block. [#39744]
+- Newsletters: Fix "Use excerpt" setting. [#39815]
+
+### Other changes
+- Map Block: Display a static map image when the block is rendered in a pattern preview. [#39768]
+- Map: Remove preview attribute. [#39768]
+- Newsletters: Fix 'class Jetpack_Subscriptions_Widget not found' fatal error during REST API. [#39765]
+- Slideshow Block: Fix console warning related to images with the same key. [#39821]
+- Story Block: Avoid error when previewing block styles in development version of the Gutenberg plugin. [#39807]
+- Story Block: Fix console warning related to 'key' not being a prop. [#39822]
+- Tests: Fix unit tests. [#39799]
+- Update VideoPress notice URL on Media Library. [#39731]
+
+## 14.0-a.5 - 2024-10-16
+### Other changes
+- Related Posts: refine how related posts are made available on singular views in block themes. [#39784]
+
+## 14.0-a.3 - 2024-10-14
+### Enhancements
+- Newsletter: Update the default "reply to" setting value from not allowed to replies being posted as public comments. [#39657]
+- Social: Add Bluesky to social previews. [#39659]
+
+### Improved compatibility
+- Image CDN: URL encode image path parts for RSS feed compatibility. [#39560]
+- Related Posts: Allow Related Posts on non-post CPTs where the block is already able to be used. [#39730]
+
+### Bug fixes
+- Blocks: Fix rendering of the goodreads block to avoid PHP warnings caused by missing attributes. [#39713]
+- Blocks: Render the slideshow block correctly inside an iframe editor. [#39551]
+- Contact Form: Ensure that submitted forms can only be accessed by logged in users allowed to view form submissions. [#39759]
+- General: Only include `wp-polyfill` as a script dependency when needed. [#39629]
+- Newsletter: Ensure `Enable featured image on your new post emails` setting displays the right value. [#39700]
+- Sharing: Ensure the sharing settings can be accessed even when a user is not connected to WordPress.com. [#39677]
+- Stats: Fix top post card on the Insight page. [#39691]
+
+### Other changes
+- Add connection nudge for blocks that are missing it. [#39647]
+- Add missing deps in calls to the `useSelect` React hook. [#39421]
+- Add tracks to connection banner. [#39732]
+- AI Assistant: Make Breve no longer flag single quotes as spelling errors. [#39735]
+- Fix issue where connection banner was showing for simple sites. [#39687]
+- Infinite-scroll: Add isset checks to validate input data. [#39618]
+- Janitorial: Add siteFragment to JP initial state definition, avoid linter warnings. [#39589]
+- Jetpack AI: Change constant value for fair usage, accept both values on type definitions. [#39705]
+- JSON Endpoints: Handle null input for update post endpoint. [#39676]
+- Optimize the 'admin_init' hook callback for Sharing module. [#39737]
+- SAL_Site class: Add null check to posts_status_obj to avoid warnings. [#39727]
+- Show connection nudge instead of error if user is not connected on blogroll block. [#39638]
+- Update package dependencies. [#39649] [#39653] [#39707]
+- Use React setState instead of directly modifying state. [#39421]
+- Widget Visibility: Add check to ensure post exists before accesing post_author. [#39746]
+
## 14.0-a.1 - 2024-10-07
### Enhancements
- Sitemap: Improve sitemap write efficienty. [#39572]
@@ -20,6 +82,10 @@
- Unify connection related CTAs on At A Glance. [#39585]
- Updated package dependencies. [#39594] [#39639]
+## 13.9.1 - 2024-10-14
+### Bug fixes
+- Contact Form: Ensure that submitted forms can only be accessed by logged in users allowed to view form submissions. [#39759]
+
## 13.9 - 2024-10-01
### Major Enhancements
- Jetpack plugin: Remove the 'WordPress.com Toolbar' module. [#39406]
diff --git a/projects/plugins/jetpack/_inc/client/newsletter/subscriptions-settings.jsx b/projects/plugins/jetpack/_inc/client/newsletter/subscriptions-settings.jsx
index 6f12121a00c07..984e585d74163 100644
--- a/projects/plugins/jetpack/_inc/client/newsletter/subscriptions-settings.jsx
+++ b/projects/plugins/jetpack/_inc/client/newsletter/subscriptions-settings.jsx
@@ -38,6 +38,7 @@ function SubscriptionsSettings( props ) {
isStcEnabled,
isSmEnabled,
isSubscribeOverlayEnabled,
+ isSubscribeFloatingEnabled,
isSubscribePostEndEnabled,
isLoginNavigationEnabled,
isSubscribeNavigationEnabled,
@@ -69,6 +70,15 @@ function SubscriptionsSettings( props ) {
} )
: null;
+ const subscribeFloatingEditorUrl =
+ siteAdminUrl && themeStylesheet
+ ? addQueryArgs( `${ siteAdminUrl }site-editor.php`, {
+ postType: 'wp_template_part',
+ postId: `${ themeStylesheet }//jetpack-subscribe-floating-button`,
+ canvas: 'edit',
+ } )
+ : null;
+
const singlePostTemplateEditorUrl = siteAdminUrl
? addQueryArgs( `${ siteAdminUrl }site-editor.php`, {
postType: 'wp_template',
@@ -99,6 +109,13 @@ function SubscriptionsSettings( props ) {
updateFormStateModuleOption( SUBSCRIPTIONS_MODULE_NAME, 'jetpack_subscribe_overlay_enabled' );
}, [ updateFormStateModuleOption ] );
+ const handleSubscribeFloatingToggleChange = useCallback( () => {
+ updateFormStateModuleOption(
+ SUBSCRIPTIONS_MODULE_NAME,
+ 'jetpack_subscribe_floating_button_enabled'
+ );
+ }, [ updateFormStateModuleOption ] );
+
const handleSubscribePostEndToggleChange = useCallback( () => {
updateFormStateModuleOption(
SUBSCRIPTIONS_MODULE_NAME,
@@ -202,6 +219,25 @@ function SubscriptionsSettings( props ) {
-
-
- ; ?>)
-
-
-
-
-
- - -
- - - - -
- ; ?> "<?php esc_attr_e( 'Check how your web site performance scores for desktop and mobile.', 'jetpack-boost' ); ?>")
-
-
- -
- { images.map( ( { alt, caption, id, url } ) => (
+ { images.map( ( { alt, caption, id, url }, index ) => (
-
{ +export const ProgressBullet = ( { + bulletIndex, + playerId, + index, + disabled, + isSelected, + onClick, +} ) => { const progress = useSelect( select => select( 'jetpack/story/player' ).getCurrentSlideProgressPercentage( playerId ), [ playerId ] @@ -10,7 +17,7 @@ export const ProgressBullet = ( { key, playerId, index, disabled, isSelected, on return (
{ return isPost; }; -// Registers slot/fill panels defined via settings.render and command palette commands +const useNewsletterPreview = () => { + const [ isPreviewModalOpen, setIsPreviewModalOpen ] = useState( false ); + const postId = select( 'core/editor' ).getCurrentPostId(); + const { tracks } = useAnalytics(); + + const openPreviewModal = useCallback( + source => { + setIsPreviewModalOpen( true ); + tracks.recordEvent( 'jetpack_newsletter_preview_opened', { source } ); + }, + [ tracks ] + ); + + const closePreviewModal = useCallback( () => { + setIsPreviewModalOpen( false ); + }, [] ); + + return { isPreviewModalOpen, openPreviewModal, closePreviewModal, postId }; +}; + +const NewsletterEditor = () => { + const { isPreviewModalOpen, openPreviewModal, closePreviewModal, postId } = + useNewsletterPreview(); + + return ( + <> + + { shouldShowNewsletterMenu() && ( + <> + { PluginPreviewMenuItem ? ( + openPreviewModal( 'preview_menu' ) } + icon={ send } + > + { __( 'Email preview', 'jetpack' ) } + + ) : null } ++ openPreviewModal( 'newsletter_menu' ) } /> + + ) } + + + ); +}; + registerJetpackPlugin( blockName, { - render: () => { - return ( - <> - - { shouldShowNewsletterMenu() && } - - - ); - }, + render: () => , icon: shouldShowNewsletterMenu() ? atSymbol : undefined, } ); diff --git a/projects/plugins/jetpack/extensions/blocks/subscriptions/menu.js b/projects/plugins/jetpack/extensions/blocks/subscriptions/menu.js index 1a59b55f49177..0258842d68005 100644 --- a/projects/plugins/jetpack/extensions/blocks/subscriptions/menu.js +++ b/projects/plugins/jetpack/extensions/blocks/subscriptions/menu.js @@ -9,11 +9,10 @@ import { META_NAME_FOR_POST_DONT_EMAIL_TO_SUBS } from '../../shared/memberships/ import { useAccessLevel } from '../../shared/memberships/edit'; import { NewsletterEmailDocumentSettings } from '../../shared/memberships/settings'; import SubscribersAffirmation from '../../shared/memberships/subscribers-affirmation'; -import { NewsletterPreviewModal, NewsletterTestEmailModal } from './email-preview'; +import { NewsletterTestEmailModal } from './email-preview'; import { SendIcon } from './icons'; -const NewsletterMenu = () => { - const [ isPreviewModalOpen, setIsPreviewModalOpen ] = useState( false ); +const NewsletterMenu = ( { openPreviewModal } ) => { const [ isTestEmailModalOpen, setIsTestEmailModalOpen ] = useState( false ); const { postId, postType, postStatus, meta } = useSelect( @@ -34,8 +33,6 @@ const NewsletterMenu = () => { const connectUrl = `${ window?.Jetpack_Editor_Initial_State?.adminUrl }admin.php?page=my-jetpack#/connection`; const shouldPromptForConnection = ! isSimpleSite() && ! isUserConnected; - const openPreviewModal = () => setIsPreviewModalOpen( true ); - const closePreviewModal = () => setIsPreviewModalOpen( false ); const openTestEmailModal = () => setIsTestEmailModalOpen( true ); const closeTestEmailModal = () => setIsTestEmailModalOpen( false ); @@ -74,11 +71,6 @@ const NewsletterMenu = () => { { __( 'Send test email', 'jetpack' ) } - { } ); describe( 'Inspector controls', () => { + beforeEach( () => { + window.JetpackScriptData = { + social: { + urls: {}, + }, + }; + } ); describe( 'Gradient settings panel', () => { test( 'displays gradient settings control panel', () => { render( ); diff --git a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/tiled-gallery.php b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/tiled-gallery.php index 95b32b92a19a2..1670a7760a1c0 100644 --- a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/tiled-gallery.php +++ b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/tiled-gallery.php @@ -180,4 +180,4 @@ private static function is_squareish_layout( $attr ) { } } -Tiled_Gallery::register(); +add_action( 'init', array( Tiled_Gallery::class, 'register' ) ); diff --git a/projects/plugins/jetpack/extensions/extended-blocks/core-site-logo/index.tsx b/projects/plugins/jetpack/extensions/extended-blocks/core-site-logo/index.tsx index 233e96aad4a65..6d34c34b5c0ac 100644 --- a/projects/plugins/jetpack/extensions/extended-blocks/core-site-logo/index.tsx +++ b/projects/plugins/jetpack/extensions/extended-blocks/core-site-logo/index.tsx @@ -102,10 +102,10 @@ const siteLogoEditWithAiComponents = createHigherOrderComponent( BlockEdit => { setIsLogoGeneratorModalVisible( false ); }, [] ); - const reloadModal = useCallback( () => { - closeModal(); - showModal(); - }, [ closeModal, showModal ] ); + // const reloadModal = useCallback( () => { + // closeModal(); + // showModal(); + // }, [ closeModal, showModal ] ); const applyLogoHandler = useCallback( ( mediaId: number ) => { @@ -135,7 +135,8 @@ const siteLogoEditWithAiComponents = createHigherOrderComponent( BlockEdit => { isOpen={ isLogoGeneratorModalVisible } onClose={ closeModal } onApplyLogo={ applyLogoHandler } - onReload={ reloadModal } + // reload is not working right and can end up showing a non functional modal + // onReload={ reloadModal } context={ PLACEMENT_CONTEXT } placement={ TOOL_PLACEMENT } siteDetails={ siteDetails } diff --git a/projects/plugins/jetpack/jetpack.php b/projects/plugins/jetpack/jetpack.php index 9c27fbbd94c38..2331d6424dfeb 100644 --- a/projects/plugins/jetpack/jetpack.php +++ b/projects/plugins/jetpack/jetpack.php @@ -4,7 +4,7 @@ * Plugin URI: https://jetpack.com * Description: Security, performance, and marketing tools made by WordPress experts. Jetpack keeps your site protected so you can focus on more important things. * Author: Automattic - * Version: 14.0-a.1 + * Version: 14.0-a.7 * Author URI: https://jetpack.com * License: GPL2+ * Text Domain: jetpack @@ -34,7 +34,7 @@ define( 'JETPACK__MINIMUM_WP_VERSION', '6.5' ); define( 'JETPACK__MINIMUM_PHP_VERSION', '7.0' ); -define( 'JETPACK__VERSION', '14.0-a.1' ); +define( 'JETPACK__VERSION', '14.0-a.7' ); /** * Constant used to fetch the connection owner token @@ -116,13 +116,11 @@ * @since 7.2.0 */ function jetpack_admin_unsupported_wp_notice() { - wp_admin_notice( - esc_html__( 'Jetpack requires a more recent version of WordPress and has been paused. Please update WordPress to continue enjoying Jetpack.', 'jetpack' ), - array( - 'type' => 'error', - 'dismissible' => true, - ) - ); + ?> + + ++ array( - 'migration_source_site_domain' => '(string) The source site URL, from the migration flow', - 'in_site_migration_flow' => '(string) The migration flow the site is in', - 'blogname' => '(string) Blog name', - 'blogdescription' => '(string) Blog description', - 'default_pingback_flag' => '(bool) Notify blogs linked from article?', - 'default_ping_status' => '(bool) Allow link notifications from other blogs?', - 'default_comment_status' => '(bool) Allow comments on new articles?', - 'blog_public' => '(string) Site visibility; -1: private, 0: discourage search engines, 1: allow search engines', - 'wpcom_data_sharing_opt_out' => '(bool) Did the site opt out of sharing public content with third parties and research partners?', - 'jetpack_sync_non_public_post_stati' => '(bool) allow sync of post and pages with non-public posts stati', - 'jetpack_relatedposts_enabled' => '(bool) Enable related posts?', - 'jetpack_relatedposts_show_context' => '(bool) Show post\'s tags and category in related posts?', - 'jetpack_relatedposts_show_date' => '(bool) Show date in related posts?', - 'jetpack_relatedposts_show_headline' => '(bool) Show headline in related posts?', - 'jetpack_relatedposts_show_thumbnails' => '(bool) Show thumbnails in related posts?', - 'jetpack_protect_whitelist' => '(array) List of IP addresses to always allow', - 'instant_search_enabled' => '(bool) Enable the new Jetpack Instant Search interface', - 'jetpack_search_enabled' => '(bool) Enable Jetpack Search', - 'jetpack_search_supported' => '(bool) Jetpack Search is supported', - 'infinite_scroll' => '(bool) Support infinite scroll of posts?', - 'default_category' => '(int) Default post category', - 'default_post_format' => '(string) Default post format', - 'require_name_email' => '(bool) Require comment authors to fill out name and email?', - 'comment_registration' => '(bool) Require users to be registered and logged in to comment?', - 'close_comments_for_old_posts' => '(bool) Automatically close comments on old posts?', - 'close_comments_days_old' => '(int) Age at which to close comments', - 'thread_comments' => '(bool) Enable threaded comments?', - 'thread_comments_depth' => '(int) Depth to thread comments', - 'page_comments' => '(bool) Break comments into pages?', - 'comments_per_page' => '(int) Number of comments to display per page', - 'default_comments_page' => '(string) newest|oldest Which page of comments to display first', - 'comment_order' => '(string) asc|desc Order to display comments within page', - 'comments_notify' => '(bool) Email me when someone comments?', - 'moderation_notify' => '(bool) Email me when a comment is helf for moderation?', - 'social_notifications_like' => '(bool) Email me when someone likes my post?', - 'social_notifications_reblog' => '(bool) Email me when someone reblogs my post?', - 'social_notifications_subscribe' => '(bool) Email me when someone subscribes to my blog?', - 'comment_moderation' => '(bool) Moderate comments for manual approval?', - 'comment_previously_approved' => '(bool) Moderate comments unless author has a previously-approved comment?', - 'comment_max_links' => '(int) Moderate comments that contain X or more links', - 'moderation_keys' => '(string) Words or phrases that trigger comment moderation, one per line', - 'disallowed_keys' => '(string) Words or phrases that mark comment spam, one per line', - 'lang_id' => '(int) ID for language blog is written in', - 'wga' => '(array) Google Analytics Settings', - 'disabled_likes' => '(bool) Are likes globally disabled (they can still be turned on per post)?', - 'disabled_reblogs' => '(bool) Are reblogs disabled on posts?', - 'jetpack_comment_likes_enabled' => '(bool) Are comment likes enabled for all comments?', - 'sharing_button_style' => '(string) Style to use for sharing buttons (icon-text, icon, text, or official)', - 'sharing_label' => '(string) Label to use for sharing buttons, e.g. "Share this:"', - 'sharing_show' => '(string|array:string) Post type or array of types where sharing buttons are to be displayed', - 'sharing_open_links' => '(string) Link target for sharing buttons (same or new)', - 'twitter_via' => '(string) Twitter username to include in tweets when people share using the Twitter button', - 'jetpack-twitter-cards-site-tag' => '(string) The Twitter username of the owner of the site\'s domain.', - 'eventbrite_api_token' => '(int) The Keyring token ID for an Eventbrite token to associate with the site', - 'timezone_string' => '(string) PHP-compatible timezone string like \'UTC-5\'', - 'gmt_offset' => '(int) Site offset from UTC in hours', - 'date_format' => '(string) PHP Date-compatible date format', - 'time_format' => '(string) PHP Date-compatible time format', - 'start_of_week' => '(int) Starting day of week (0 = Sunday, 6 = Saturday)', - 'jetpack_testimonial' => '(bool) Whether testimonial custom post type is enabled for the site', - 'jetpack_testimonial_posts_per_page' => '(int) Number of testimonials to show per page', - 'jetpack_portfolio' => '(bool) Whether portfolio custom post type is enabled for the site', - 'jetpack_portfolio_posts_per_page' => '(int) Number of portfolio projects to show per page', - Jetpack_SEO_Utils::FRONT_PAGE_META_OPTION => '(string) The seo meta description for the site.', - Jetpack_SEO_Titles::TITLE_FORMATS_OPTION => '(array) SEO meta title formats. Allowed keys: front_page, posts, pages, groups, archives', - 'verification_services_codes' => '(array) Website verification codes. Allowed keys: google, pinterest, bing, yandex, facebook', - 'markdown_supported' => '(bool) Whether markdown is supported for this site', - 'wpcom_publish_posts_with_markdown' => '(bool) Whether markdown is enabled for posts', - 'wpcom_publish_comments_with_markdown' => '(bool) Whether markdown is enabled for comments', - 'site_icon' => '(int) Media attachment ID to use as site icon. Set to zero or an otherwise empty value to clear', - 'api_cache' => '(bool) Turn on/off the Jetpack JSON API cache', - 'posts_per_page' => '(int) Number of posts to show on blog pages', - 'posts_per_rss' => '(int) Number of posts to show in the RSS feed', - 'rss_use_excerpt' => '(bool) Whether the RSS feed will use post excerpts', - 'launchpad_screen' => '(string) Whether or not launchpad is presented and what size it will be', - 'sm_enabled' => '(bool) Whether the newsletter subscribe modal is enabled', - 'jetpack_subscribe_overlay_enabled' => '(bool) Whether the newsletter subscribe overlay is enabled', + 'migration_source_site_domain' => '(string) The source site URL, from the migration flow', + 'in_site_migration_flow' => '(string) The migration flow the site is in', + 'blogname' => '(string) Blog name', + 'blogdescription' => '(string) Blog description', + 'default_pingback_flag' => '(bool) Notify blogs linked from article?', + 'default_ping_status' => '(bool) Allow link notifications from other blogs?', + 'default_comment_status' => '(bool) Allow comments on new articles?', + 'blog_public' => '(string) Site visibility; -1: private, 0: discourage search engines, 1: allow search engines', + 'wpcom_data_sharing_opt_out' => '(bool) Did the site opt out of sharing public content with third parties and research partners?', + 'jetpack_sync_non_public_post_stati' => '(bool) allow sync of post and pages with non-public posts stati', + 'jetpack_relatedposts_enabled' => '(bool) Enable related posts?', + 'jetpack_relatedposts_show_context' => '(bool) Show post\'s tags and category in related posts?', + 'jetpack_relatedposts_show_date' => '(bool) Show date in related posts?', + 'jetpack_relatedposts_show_headline' => '(bool) Show headline in related posts?', + 'jetpack_relatedposts_show_thumbnails' => '(bool) Show thumbnails in related posts?', + 'jetpack_protect_whitelist' => '(array) List of IP addresses to always allow', + 'instant_search_enabled' => '(bool) Enable the new Jetpack Instant Search interface', + 'jetpack_search_enabled' => '(bool) Enable Jetpack Search', + 'jetpack_search_supported' => '(bool) Jetpack Search is supported', + 'infinite_scroll' => '(bool) Support infinite scroll of posts?', + 'default_category' => '(int) Default post category', + 'default_post_format' => '(string) Default post format', + 'require_name_email' => '(bool) Require comment authors to fill out name and email?', + 'comment_registration' => '(bool) Require users to be registered and logged in to comment?', + 'close_comments_for_old_posts' => '(bool) Automatically close comments on old posts?', + 'close_comments_days_old' => '(int) Age at which to close comments', + 'thread_comments' => '(bool) Enable threaded comments?', + 'thread_comments_depth' => '(int) Depth to thread comments', + 'page_comments' => '(bool) Break comments into pages?', + 'comments_per_page' => '(int) Number of comments to display per page', + 'default_comments_page' => '(string) newest|oldest Which page of comments to display first', + 'comment_order' => '(string) asc|desc Order to display comments within page', + 'comments_notify' => '(bool) Email me when someone comments?', + 'moderation_notify' => '(bool) Email me when a comment is helf for moderation?', + 'social_notifications_like' => '(bool) Email me when someone likes my post?', + 'social_notifications_reblog' => '(bool) Email me when someone reblogs my post?', + 'social_notifications_subscribe' => '(bool) Email me when someone subscribes to my blog?', + 'comment_moderation' => '(bool) Moderate comments for manual approval?', + 'comment_previously_approved' => '(bool) Moderate comments unless author has a previously-approved comment?', + 'comment_max_links' => '(int) Moderate comments that contain X or more links', + 'moderation_keys' => '(string) Words or phrases that trigger comment moderation, one per line', + 'disallowed_keys' => '(string) Words or phrases that mark comment spam, one per line', + 'lang_id' => '(int) ID for language blog is written in', + 'wga' => '(array) Google Analytics Settings', + 'disabled_likes' => '(bool) Are likes globally disabled (they can still be turned on per post)?', + 'disabled_reblogs' => '(bool) Are reblogs disabled on posts?', + 'jetpack_comment_likes_enabled' => '(bool) Are comment likes enabled for all comments?', + 'sharing_button_style' => '(string) Style to use for sharing buttons (icon-text, icon, text, or official)', + 'sharing_label' => '(string) Label to use for sharing buttons, e.g. "Share this:"', + 'sharing_show' => '(string|array:string) Post type or array of types where sharing buttons are to be displayed', + 'sharing_open_links' => '(string) Link target for sharing buttons (same or new)', + 'twitter_via' => '(string) Twitter username to include in tweets when people share using the Twitter button', + 'jetpack-twitter-cards-site-tag' => '(string) The Twitter username of the owner of the site\'s domain.', + 'eventbrite_api_token' => '(int) The Keyring token ID for an Eventbrite token to associate with the site', + 'timezone_string' => '(string) PHP-compatible timezone string like \'UTC-5\'', + 'gmt_offset' => '(int) Site offset from UTC in hours', + 'date_format' => '(string) PHP Date-compatible date format', + 'time_format' => '(string) PHP Date-compatible time format', + 'start_of_week' => '(int) Starting day of week (0 = Sunday, 6 = Saturday)', + 'jetpack_testimonial' => '(bool) Whether testimonial custom post type is enabled for the site', + 'jetpack_testimonial_posts_per_page' => '(int) Number of testimonials to show per page', + 'jetpack_portfolio' => '(bool) Whether portfolio custom post type is enabled for the site', + 'jetpack_portfolio_posts_per_page' => '(int) Number of portfolio projects to show per page', + Jetpack_SEO_Utils::FRONT_PAGE_META_OPTION => '(string) The seo meta description for the site.', + Jetpack_SEO_Titles::TITLE_FORMATS_OPTION => '(array) SEO meta title formats. Allowed keys: front_page, posts, pages, groups, archives', + 'verification_services_codes' => '(array) Website verification codes. Allowed keys: google, pinterest, bing, yandex, facebook', + 'markdown_supported' => '(bool) Whether markdown is supported for this site', + 'wpcom_publish_posts_with_markdown' => '(bool) Whether markdown is enabled for posts', + 'wpcom_publish_comments_with_markdown' => '(bool) Whether markdown is enabled for comments', + 'site_icon' => '(int) Media attachment ID to use as site icon. Set to zero or an otherwise empty value to clear', + 'api_cache' => '(bool) Turn on/off the Jetpack JSON API cache', + 'posts_per_page' => '(int) Number of posts to show on blog pages', + 'posts_per_rss' => '(int) Number of posts to show in the RSS feed', + 'rss_use_excerpt' => '(bool) Whether the RSS feed will use post excerpts', + 'launchpad_screen' => '(string) Whether or not launchpad is presented and what size it will be', + 'sm_enabled' => '(bool) Whether the newsletter subscribe modal is enabled', + 'jetpack_subscribe_overlay_enabled' => '(bool) Whether the newsletter subscribe overlay is enabled', + 'jetpack_subscribe_floating_button_enabled' => '(bool) Whether the newsletter floating subscribe button is enabled', 'jetpack_subscriptions_subscribe_post_end_enabled' => '(bool) Whether the Subscribe block at the end of each post placement is enabled', 'jetpack_subscriptions_login_navigation_enabled' => '(bool) Whether the Subscriber Login block navigation placement is enabled', 'jetpack_subscriptions_subscribe_navigation_enabled' => '(Bool) Whether the Subscribe block navigation placement is enabled', - 'wpcom_ai_site_prompt' => '(string) User input in the AI site prompt', - 'jetpack_waf_automatic_rules' => '(bool) Whether the WAF should enforce automatic firewall rules', - 'jetpack_waf_ip_allow_list' => '(string) List of IP addresses to always allow', - 'jetpack_waf_ip_allow_list_enabled' => '(bool) Whether the IP allow list is enabled', - 'jetpack_waf_ip_block_list' => '(string) List of IP addresses the WAF should always block', - 'jetpack_waf_ip_block_list_enabled' => '(bool) Whether the IP block list is enabled', - 'jetpack_waf_share_data' => '(bool) Whether the WAF should share basic data with Jetpack', - 'jetpack_waf_share_debug_data' => '(bool) Whether the WAF should share debug data with Jetpack', + 'wpcom_ai_site_prompt' => '(string) User input in the AI site prompt', + 'jetpack_waf_automatic_rules' => '(bool) Whether the WAF should enforce automatic firewall rules', + 'jetpack_waf_ip_allow_list' => '(string) List of IP addresses to always allow', + 'jetpack_waf_ip_allow_list_enabled' => '(bool) Whether the IP allow list is enabled', + 'jetpack_waf_ip_block_list' => '(string) List of IP addresses the WAF should always block', + 'jetpack_waf_ip_block_list_enabled' => '(bool) Whether the IP block list is enabled', + 'jetpack_waf_share_data' => '(bool) Whether the WAF should share basic data with Jetpack', + 'jetpack_waf_share_debug_data' => '(bool) Whether the WAF should share debug data with Jetpack', 'jetpack_waf_automatic_rules_last_updated_timestamp' => '(int) Timestamp of the last time the automatic rules were updated', ), @@ -469,12 +470,13 @@ function ( $newsletter_category ) { 'wpcom_newsletter_categories_enabled' => (bool) get_option( 'wpcom_newsletter_categories_enabled' ), 'sm_enabled' => (bool) get_option( 'sm_enabled' ), 'jetpack_subscribe_overlay_enabled' => (bool) get_option( 'jetpack_subscribe_overlay_enabled' ), + 'jetpack_subscribe_floating_button_enabled' => (bool) get_option( 'jetpack_subscribe_floating_button_enabled' ), 'jetpack_subscriptions_subscribe_post_end_enabled' => (bool) get_option( 'jetpack_subscriptions_subscribe_post_end_enabled' ), 'jetpack_subscriptions_login_navigation_enabled' => (bool) get_option( 'jetpack_subscriptions_login_navigation_enabled' ), 'jetpack_subscriptions_subscribe_navigation_enabled' => (bool) get_option( 'jetpack_subscriptions_subscribe_navigation_enabled' ), 'wpcom_gifting_subscription' => (bool) get_option( 'wpcom_gifting_subscription', $this->get_wpcom_gifting_subscription_default() ), 'wpcom_reader_views_enabled' => (bool) get_option( 'wpcom_reader_views_enabled', true ), - 'wpcom_subscription_emails_use_excerpt' => $this->get_wpcom_subscription_emails_use_excerpt_option(), + 'wpcom_subscription_emails_use_excerpt' => (bool) get_option( 'wpcom_subscription_emails_use_excerpt' ), 'jetpack_subscriptions_reply_to' => (string) $this->get_subscriptions_reply_to_option(), 'jetpack_subscriptions_from_name' => (string) get_option( 'jetpack_subscriptions_from_name' ), 'show_on_front' => (string) get_option( 'show_on_front' ), @@ -1092,6 +1094,11 @@ function ( $category_id ) { $updated[ $key ] = (int) (bool) $value; break; + case 'jetpack_subscribe_floating_button_enabled': + update_option( 'jetpack_subscribe_floating_button_enabled', (int) (bool) $value ); + $updated[ $key ] = (int) (bool) $value; + break; + case 'jetpack_subscriptions_subscribe_post_end_enabled': update_option( 'jetpack_subscriptions_subscribe_post_end_enabled', (int) (bool) $value ); $updated[ $key ] = (int) (bool) $value; @@ -1275,23 +1282,6 @@ function ( $category_id ) { ); } - /** - * Get the value of the wpcom_subscription_emails_use_excerpt option. - * When the option is not set, it will return the value of the rss_use_excerpt option. - * - * @return bool - */ - protected function get_wpcom_subscription_emails_use_excerpt_option() { - $wpcom_subscription_emails_use_excerpt = get_option( 'wpcom_subscription_emails_use_excerpt', null ); - - if ( $wpcom_subscription_emails_use_excerpt === null ) { - $rss_use_excerpt = get_option( 'rss_use_excerpt', null ); - $wpcom_subscription_emails_use_excerpt = $rss_use_excerpt === null ? false : $rss_use_excerpt; - } - - return (bool) $wpcom_subscription_emails_use_excerpt; - } - /** * Get the string value of the jetpack_subscriptions_reply_to option. * When the option is not set, it will retun 'no-reply'. diff --git a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-v1-4-endpoint.php b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-v1-4-endpoint.php index 9c6d1cdd4506b..bb0da75ecd15c 100644 --- a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-v1-4-endpoint.php +++ b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-v1-4-endpoint.php @@ -35,117 +35,118 @@ ), 'request_format' => array( - 'migration_source_site_domain' => '(string) The source site URL, from the migration flow', - 'in_site_migration_flow' => '(string) Whether the site is currently in the Site Migration signup flow.', - 'blogname' => '(string) Blog name', - 'blogdescription' => '(string) Blog description', - 'default_pingback_flag' => '(bool) Notify blogs linked from article?', - 'default_ping_status' => '(bool) Allow link notifications from other blogs?', - 'default_comment_status' => '(bool) Allow comments on new articles?', - 'blog_public' => '(string) Site visibility; -1: private, 0: discourage search engines, 1: allow search engines', - 'wpcom_data_sharing_opt_out' => '(bool) Did the site opt out of public content sharing with third parties and research partners?', - 'jetpack_sync_non_public_post_stati' => '(bool) allow sync of post and pages with non-public posts stati', - 'jetpack_relatedposts_enabled' => '(bool) Enable related posts?', - 'jetpack_relatedposts_show_context' => '(bool) Show post\'s tags and category in related posts?', - 'jetpack_relatedposts_show_date' => '(bool) Show date in related posts?', - 'jetpack_relatedposts_show_headline' => '(bool) Show headline in related posts?', - 'jetpack_relatedposts_show_thumbnails' => '(bool) Show thumbnails in related posts?', - 'instant_search_enabled' => '(bool) Enable the new Jetpack Instant Search interface', - 'jetpack_search_enabled' => '(bool) Enable Jetpack Search', - 'jetpack_search_supported' => '(bool) Jetpack Search supported', - 'jetpack_protect_whitelist' => '(array) List of IP addresses to always allow', - 'infinite_scroll' => '(bool) Support infinite scroll of posts?', - 'default_category' => '(int) Default post category', - 'default_post_format' => '(string) Default post format', - 'require_name_email' => '(bool) Require comment authors to fill out name and email?', - 'comment_registration' => '(bool) Require users to be registered and logged in to comment?', - 'close_comments_for_old_posts' => '(bool) Automatically close comments on old posts?', - 'close_comments_days_old' => '(int) Age at which to close comments', - 'thread_comments' => '(bool) Enable threaded comments?', - 'thread_comments_depth' => '(int) Depth to thread comments', - 'page_comments' => '(bool) Break comments into pages?', - 'comments_per_page' => '(int) Number of comments to display per page', - 'default_comments_page' => '(string) newest|oldest Which page of comments to display first', - 'comment_order' => '(string) asc|desc Order to display comments within page', - 'comments_notify' => '(bool) Email me when someone comments?', - 'moderation_notify' => '(bool) Email me when a comment is helf for moderation?', - 'social_notifications_like' => '(bool) Email me when someone likes my post?', - 'social_notifications_reblog' => '(bool) Email me when someone reblogs my post?', - 'social_notifications_subscribe' => '(bool) Email me when someone subscribes to my blog?', - 'comment_moderation' => '(bool) Moderate comments for manual approval?', - 'comment_previously_approved' => '(bool) Moderate comments unless author has a previously-approved comment?', - 'comment_max_links' => '(int) Moderate comments that contain X or more links', - 'moderation_keys' => '(string) Words or phrases that trigger comment moderation, one per line', - 'disallowed_keys' => '(string) Words or phrases that mark comment spam, one per line', - 'lang_id' => '(int) ID for language blog is written in', - 'locale' => '(string) locale code for language blog is written in', - 'site_vertical_id' => '(string) The site vertical ID', - 'wga' => '(array) Google Analytics Settings', - 'jetpack_cloudflare_analytics' => '(array) Cloudflare Analytics Settings', - 'disabled_likes' => '(bool) Are likes globally disabled (they can still be turned on per post)?', - 'disabled_reblogs' => '(bool) Are reblogs disabled on posts?', - 'jetpack_comment_likes_enabled' => '(bool) Are comment likes enabled for all comments?', - 'sharing_button_style' => '(string) Style to use for sharing buttons (icon-text, icon, text, or official)', - 'sharing_label' => '(string) Label to use for sharing buttons, e.g. "Share this:"', - 'sharing_show' => '(string|array:string) Post type or array of types where sharing buttons are to be displayed', - 'sharing_open_links' => '(string) Link target for sharing buttons (same or new)', - 'twitter_via' => '(string) Twitter username to include in tweets when people share using the Twitter button', - 'jetpack-twitter-cards-site-tag' => '(string) The Twitter username of the owner of the site\'s domain.', - 'eventbrite_api_token' => '(int) The Keyring token ID for an Eventbrite token to associate with the site', - 'timezone_string' => '(string) PHP-compatible timezone string like \'UTC-5\'', - 'gmt_offset' => '(int) Site offset from UTC in hours', - 'date_format' => '(string) PHP Date-compatible date format', - 'time_format' => '(string) PHP Date-compatible time format', - 'start_of_week' => '(int) Starting day of week (0 = Sunday, 6 = Saturday)', - 'woocommerce_onboarding_profile' => '(array) woocommerce_onboarding_profile', - 'woocommerce_store_address' => '(string) woocommerce_store_address option', - 'woocommerce_store_address_2' => '(string) woocommerce_store_address_2 option', - 'woocommerce_store_city' => '(string) woocommerce_store_city option', - 'woocommerce_default_country' => '(string) woocommerce_default_country option', - 'woocommerce_store_postcode' => '(string) woocommerce_store_postcode option', - 'jetpack_testimonial' => '(bool) Whether testimonial custom post type is enabled for the site', - 'jetpack_testimonial_posts_per_page' => '(int) Number of testimonials to show per page', - 'jetpack_portfolio' => '(bool) Whether portfolio custom post type is enabled for the site', - 'jetpack_portfolio_posts_per_page' => '(int) Number of portfolio projects to show per page', - Jetpack_SEO_Utils::FRONT_PAGE_META_OPTION => '(string) The SEO meta description for the site.', - Jetpack_SEO_Titles::TITLE_FORMATS_OPTION => '(array) SEO meta title formats. Allowed keys: front_page, posts, pages, groups, archives', - 'verification_services_codes' => '(array) Website verification codes. Allowed keys: google, pinterest, bing, yandex, facebook', - 'podcasting_archive' => '(string) The post category, if any, used for publishing podcasts', - 'site_icon' => '(int) Media attachment ID to use as site icon. Set to zero or an otherwise empty value to clear', - 'api_cache' => '(bool) Turn on/off the Jetpack JSON API cache', - 'posts_per_page' => '(int) Number of posts to show on blog pages', - 'posts_per_rss' => '(int) Number of posts to show in the RSS feed', - 'rss_use_excerpt' => '(bool) Whether the RSS feed will use post excerpts', - 'wpcom_publish_posts_with_markdown' => '(bool) Whether markdown is enabled for posts', - 'wpcom_publish_comments_with_markdown' => '(bool) Whether markdown is enabled for comments', - 'launchpad_screen' => '(string) Whether or not launchpad is presented and what size it will be', - 'wpcom_featured_image_in_email' => '(bool) Whether the Featured image is displayed in the New Post email template or not', - 'jetpack_gravatar_in_email' => '(bool) Whether to show author avatar in the email byline', - 'jetpack_author_in_email' => '(bool) Whether to show author display name in the email byline', - 'jetpack_post_date_in_email' => '(bool) Whether to show date in the email byline', - 'wpcom_newsletter_categories' => '(array) Array of post category ids that are marked as newsletter categories', - 'wpcom_newsletter_categories_enabled' => '(bool) Whether the newsletter categories are enabled or not', - 'sm_enabled' => '(bool) Whether the newsletter Subscribe Modal is enabled or not', - 'jetpack_subscribe_overlay_enabled' => '(bool) Whether the newsletter Subscribe Overlay is enabled or not', + 'migration_source_site_domain' => '(string) The source site URL, from the migration flow', + 'in_site_migration_flow' => '(string) Whether the site is currently in the Site Migration signup flow.', + 'blogname' => '(string) Blog name', + 'blogdescription' => '(string) Blog description', + 'default_pingback_flag' => '(bool) Notify blogs linked from article?', + 'default_ping_status' => '(bool) Allow link notifications from other blogs?', + 'default_comment_status' => '(bool) Allow comments on new articles?', + 'blog_public' => '(string) Site visibility; -1: private, 0: discourage search engines, 1: allow search engines', + 'wpcom_data_sharing_opt_out' => '(bool) Did the site opt out of public content sharing with third parties and research partners?', + 'jetpack_sync_non_public_post_stati' => '(bool) allow sync of post and pages with non-public posts stati', + 'jetpack_relatedposts_enabled' => '(bool) Enable related posts?', + 'jetpack_relatedposts_show_context' => '(bool) Show post\'s tags and category in related posts?', + 'jetpack_relatedposts_show_date' => '(bool) Show date in related posts?', + 'jetpack_relatedposts_show_headline' => '(bool) Show headline in related posts?', + 'jetpack_relatedposts_show_thumbnails' => '(bool) Show thumbnails in related posts?', + 'instant_search_enabled' => '(bool) Enable the new Jetpack Instant Search interface', + 'jetpack_search_enabled' => '(bool) Enable Jetpack Search', + 'jetpack_search_supported' => '(bool) Jetpack Search supported', + 'jetpack_protect_whitelist' => '(array) List of IP addresses to always allow', + 'infinite_scroll' => '(bool) Support infinite scroll of posts?', + 'default_category' => '(int) Default post category', + 'default_post_format' => '(string) Default post format', + 'require_name_email' => '(bool) Require comment authors to fill out name and email?', + 'comment_registration' => '(bool) Require users to be registered and logged in to comment?', + 'close_comments_for_old_posts' => '(bool) Automatically close comments on old posts?', + 'close_comments_days_old' => '(int) Age at which to close comments', + 'thread_comments' => '(bool) Enable threaded comments?', + 'thread_comments_depth' => '(int) Depth to thread comments', + 'page_comments' => '(bool) Break comments into pages?', + 'comments_per_page' => '(int) Number of comments to display per page', + 'default_comments_page' => '(string) newest|oldest Which page of comments to display first', + 'comment_order' => '(string) asc|desc Order to display comments within page', + 'comments_notify' => '(bool) Email me when someone comments?', + 'moderation_notify' => '(bool) Email me when a comment is helf for moderation?', + 'social_notifications_like' => '(bool) Email me when someone likes my post?', + 'social_notifications_reblog' => '(bool) Email me when someone reblogs my post?', + 'social_notifications_subscribe' => '(bool) Email me when someone subscribes to my blog?', + 'comment_moderation' => '(bool) Moderate comments for manual approval?', + 'comment_previously_approved' => '(bool) Moderate comments unless author has a previously-approved comment?', + 'comment_max_links' => '(int) Moderate comments that contain X or more links', + 'moderation_keys' => '(string) Words or phrases that trigger comment moderation, one per line', + 'disallowed_keys' => '(string) Words or phrases that mark comment spam, one per line', + 'lang_id' => '(int) ID for language blog is written in', + 'locale' => '(string) locale code for language blog is written in', + 'site_vertical_id' => '(string) The site vertical ID', + 'wga' => '(array) Google Analytics Settings', + 'jetpack_cloudflare_analytics' => '(array) Cloudflare Analytics Settings', + 'disabled_likes' => '(bool) Are likes globally disabled (they can still be turned on per post)?', + 'disabled_reblogs' => '(bool) Are reblogs disabled on posts?', + 'jetpack_comment_likes_enabled' => '(bool) Are comment likes enabled for all comments?', + 'sharing_button_style' => '(string) Style to use for sharing buttons (icon-text, icon, text, or official)', + 'sharing_label' => '(string) Label to use for sharing buttons, e.g. "Share this:"', + 'sharing_show' => '(string|array:string) Post type or array of types where sharing buttons are to be displayed', + 'sharing_open_links' => '(string) Link target for sharing buttons (same or new)', + 'twitter_via' => '(string) Twitter username to include in tweets when people share using the Twitter button', + 'jetpack-twitter-cards-site-tag' => '(string) The Twitter username of the owner of the site\'s domain.', + 'eventbrite_api_token' => '(int) The Keyring token ID for an Eventbrite token to associate with the site', + 'timezone_string' => '(string) PHP-compatible timezone string like \'UTC-5\'', + 'gmt_offset' => '(int) Site offset from UTC in hours', + 'date_format' => '(string) PHP Date-compatible date format', + 'time_format' => '(string) PHP Date-compatible time format', + 'start_of_week' => '(int) Starting day of week (0 = Sunday, 6 = Saturday)', + 'woocommerce_onboarding_profile' => '(array) woocommerce_onboarding_profile', + 'woocommerce_store_address' => '(string) woocommerce_store_address option', + 'woocommerce_store_address_2' => '(string) woocommerce_store_address_2 option', + 'woocommerce_store_city' => '(string) woocommerce_store_city option', + 'woocommerce_default_country' => '(string) woocommerce_default_country option', + 'woocommerce_store_postcode' => '(string) woocommerce_store_postcode option', + 'jetpack_testimonial' => '(bool) Whether testimonial custom post type is enabled for the site', + 'jetpack_testimonial_posts_per_page' => '(int) Number of testimonials to show per page', + 'jetpack_portfolio' => '(bool) Whether portfolio custom post type is enabled for the site', + 'jetpack_portfolio_posts_per_page' => '(int) Number of portfolio projects to show per page', + Jetpack_SEO_Utils::FRONT_PAGE_META_OPTION => '(string) The SEO meta description for the site.', + Jetpack_SEO_Titles::TITLE_FORMATS_OPTION => '(array) SEO meta title formats. Allowed keys: front_page, posts, pages, groups, archives', + 'verification_services_codes' => '(array) Website verification codes. Allowed keys: google, pinterest, bing, yandex, facebook', + 'podcasting_archive' => '(string) The post category, if any, used for publishing podcasts', + 'site_icon' => '(int) Media attachment ID to use as site icon. Set to zero or an otherwise empty value to clear', + 'api_cache' => '(bool) Turn on/off the Jetpack JSON API cache', + 'posts_per_page' => '(int) Number of posts to show on blog pages', + 'posts_per_rss' => '(int) Number of posts to show in the RSS feed', + 'rss_use_excerpt' => '(bool) Whether the RSS feed will use post excerpts', + 'wpcom_publish_posts_with_markdown' => '(bool) Whether markdown is enabled for posts', + 'wpcom_publish_comments_with_markdown' => '(bool) Whether markdown is enabled for comments', + 'launchpad_screen' => '(string) Whether or not launchpad is presented and what size it will be', + 'wpcom_featured_image_in_email' => '(bool) Whether the Featured image is displayed in the New Post email template or not', + 'jetpack_gravatar_in_email' => '(bool) Whether to show author avatar in the email byline', + 'jetpack_author_in_email' => '(bool) Whether to show author display name in the email byline', + 'jetpack_post_date_in_email' => '(bool) Whether to show date in the email byline', + 'wpcom_newsletter_categories' => '(array) Array of post category ids that are marked as newsletter categories', + 'wpcom_newsletter_categories_enabled' => '(bool) Whether the newsletter categories are enabled or not', + 'sm_enabled' => '(bool) Whether the newsletter Subscribe Modal is enabled or not', + 'jetpack_subscribe_overlay_enabled' => '(bool) Whether the newsletter Subscribe Overlay is enabled or not', + 'jetpack_subscribe_floating_button_enabled' => '(bool) Whether the newsletter floating subscribe button is enabled or not', 'jetpack_subscriptions_subscribe_post_end_enabled' => '(bool) Whether adding Subscribe block at the end of each post is enabled or not', 'jetpack_subscriptions_login_navigation_enabled' => '(bool) Whether the Subscriber Login block navigation placement is enabled or not', 'jetpack_subscriptions_subscribe_navigation_enabled' => '(bool) Whether the Subscribe block navigation placement is enabled or not', - 'wpcom_gifting_subscription' => '(bool) Whether gifting is enabled for non auto-renew sites', - 'wpcom_reader_views_enabled' => '(bool) Whether showing post views in WordPress.com Reader is enabled for the site', - 'wpcom_subscription_emails_use_excerpt' => '(bool) Whether site subscription emails (e.g. New Post email notification) will use post excerpts', - 'jetpack_subscriptions_reply_to' => '(string) The reply to email behaviour for newsletter emails', - 'jetpack_subscriptions_from_name' => '(string) The from name for newsletter emails', - 'show_on_front' => '(string) Whether homepage should display related posts or a static page. The expected value is \'posts\' or \'page\'.', - 'page_on_front' => '(string) The page ID of the page to use as the site\'s homepage. It will apply only if \'show_on_front\' is set to \'page\'.', - 'page_for_posts' => '(string) The page ID of the page to use as the site\'s posts page. It will apply only if \'show_on_front\' is set to \'page\'.', - 'subscription_options' => '(array) Array of three options used in subscription email templates: \'invitation\', \'welcome\' and \'comment_follow\' strings.', - 'jetpack_verbum_subscription_modal' => '(bool) Whether Subscription modal is enabled in Verbum comments', - 'wpcom_ai_site_prompt' => '(string) User input in the AI site prompt', - 'enable_verbum_commenting' => '(bool) Whether Verbum commenting is enabled', - 'enable_blocks_comments' => '(bool) Whether blocks comments are enabled', - 'highlander_comment_form_prompt' => '(string) The prompt for the comment form', - 'jetpack_comment_form_color_scheme' => '(string) The color scheme for the comment form', - 'is_fully_managed_agency_site' => '(bool) Whether the site is a fully managed agency site', + 'wpcom_gifting_subscription' => '(bool) Whether gifting is enabled for non auto-renew sites', + 'wpcom_reader_views_enabled' => '(bool) Whether showing post views in WordPress.com Reader is enabled for the site', + 'wpcom_subscription_emails_use_excerpt' => '(bool) Whether site subscription emails (e.g. New Post email notification) will use post excerpts', + 'jetpack_subscriptions_reply_to' => '(string) The reply to email behaviour for newsletter emails', + 'jetpack_subscriptions_from_name' => '(string) The from name for newsletter emails', + 'show_on_front' => '(string) Whether homepage should display related posts or a static page. The expected value is \'posts\' or \'page\'.', + 'page_on_front' => '(string) The page ID of the page to use as the site\'s homepage. It will apply only if \'show_on_front\' is set to \'page\'.', + 'page_for_posts' => '(string) The page ID of the page to use as the site\'s posts page. It will apply only if \'show_on_front\' is set to \'page\'.', + 'subscription_options' => '(array) Array of three options used in subscription email templates: \'invitation\', \'welcome\' and \'comment_follow\' strings.', + 'jetpack_verbum_subscription_modal' => '(bool) Whether Subscription modal is enabled in Verbum comments', + 'wpcom_ai_site_prompt' => '(string) User input in the AI site prompt', + 'enable_verbum_commenting' => '(bool) Whether Verbum commenting is enabled', + 'enable_blocks_comments' => '(bool) Whether blocks comments are enabled', + 'highlander_comment_form_prompt' => '(string) The prompt for the comment form', + 'jetpack_comment_form_color_scheme' => '(string) The color scheme for the comment form', + 'is_fully_managed_agency_site' => '(bool) Whether the site is a fully managed agency site', ), 'response_format' => array( diff --git a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-upload-media-v1-1-endpoint.php b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-upload-media-v1-1-endpoint.php index 2dd816c37e249..5ea49e7d89ba6 100644 --- a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-upload-media-v1-1-endpoint.php +++ b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-upload-media-v1-1-endpoint.php @@ -93,7 +93,7 @@ public function callback( $path = '', $blog_id = 0 ) { // We're splitting out videos for Jetpack sites. foreach ( $media_files as $media_item ) { - if ( preg_match( '@^video/@', $media_item['type'] ) && $is_jetpack_site ) { + if ( isset( $media_item['type'] ) && preg_match( '@^video/@', $media_item['type'] ) && $is_jetpack_site ) { if ( defined( 'IS_WPCOM' ) && IS_WPCOM && defined( 'VIDEOPRESS_JETPACK_VIDEO_ENABLED' ) && VIDEOPRESS_JETPACK_VIDEO_ENABLED ) { diff --git a/projects/plugins/jetpack/modules/infinite-scroll/infinity.php b/projects/plugins/jetpack/modules/infinite-scroll/infinity.php index f56fdd98231c4..cd0230308ec87 100644 --- a/projects/plugins/jetpack/modules/infinite-scroll/infinity.php +++ b/projects/plugins/jetpack/modules/infinite-scroll/infinity.php @@ -772,7 +772,7 @@ public function query_time_filter( $where, $query ) { * will always return results prior to (descending sort) * or before (ascending sort) the last post date. * - * @deprecated $$next-version$$ + * @deprecated 14.0 * * @module infinite-scroll * @@ -783,7 +783,7 @@ public function query_time_filter( $where, $query ) { */ $operator = '<'; $last_post_date = isset( $_REQUEST['last_post_date'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['last_post_date'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- no changes to the site - $where .= apply_filters_deprecated( 'infinite_scroll_posts_where', array( $clause, $query, $operator, $last_post_date ), '$$next-version$$', '' ); + $where .= apply_filters_deprecated( 'infinite_scroll_posts_where', array( $clause, $query, $operator, $last_post_date ), '14.0', '' ); } return $where; diff --git a/projects/plugins/jetpack/modules/related-posts/jetpack-related-posts.php b/projects/plugins/jetpack/modules/related-posts/jetpack-related-posts.php index 827bffdd56822..fcbb64cefd177 100644 --- a/projects/plugins/jetpack/modules/related-posts/jetpack-related-posts.php +++ b/projects/plugins/jetpack/modules/related-posts/jetpack-related-posts.php @@ -1883,12 +1883,20 @@ protected function log_click( $post_id, $to_post_id, $link_position ) { // phpcs /** * Determines if the current post is able to use related posts. * - * @since $$next-version$$ Checks for singular instead of single to allow usage on non-posts CPTs. + * @since 14.0 Checks for singular instead of single to allow usage on non-posts CPTs in block themes. * @uses self::get_options, is_admin, is_singular, apply_filters * @return bool */ protected function enabled_for_request() { - $enabled = is_singular() + /* + * On block themes, allow usage on any singular view (post, page, CPT). + * On classic themes, only allow usage on single posts by default. + */ + $enabled_on_singular_views = wp_is_block_theme() + ? is_singular() + : is_single(); + + $enabled = $enabled_on_singular_views && ! is_attachment() && ! is_admin() && ! is_embed() diff --git a/projects/plugins/jetpack/modules/stats.php b/projects/plugins/jetpack/modules/stats.php index e306bc9d180e9..224ba4a177d89 100644 --- a/projects/plugins/jetpack/modules/stats.php +++ b/projects/plugins/jetpack/modules/stats.php @@ -54,7 +54,10 @@ function stats_load() { Jetpack::enable_module_configurable( __FILE__ ); - add_action( 'wp_head', 'stats_admin_bar_head', 100 ); + // Only run the callback for those who can see the stats. + if ( is_user_logged_in() && current_user_can( 'view_stats' ) ) { + add_action( 'wp_head', 'stats_admin_bar_head', 100 ); + } add_action( 'jetpack_admin_menu', 'stats_admin_menu' ); @@ -1668,7 +1671,7 @@ function stats_get_remote_csv( $url ) { */ function stats_str_getcsv( $csv ) { // @todo Correctly handle embedded newlines. Note, despite claims online, `str_getcsv( $csv, "\n" )` does not actually work. - $lines = explode( "\n", $csv ); + $lines = explode( "\n", rtrim( $csv, "\n" ) ); return array_map( function ( $line ) { // @todo When we drop support for PHP <7.4, consider passing empty-string for `$escape` here for better spec compatibility. diff --git a/projects/plugins/jetpack/modules/subscriptions.php b/projects/plugins/jetpack/modules/subscriptions.php index 87801f8868919..850f474f00c4f 100644 --- a/projects/plugins/jetpack/modules/subscriptions.php +++ b/projects/plugins/jetpack/modules/subscriptions.php @@ -1047,3 +1047,4 @@ public function track_newsletter_category_creation() { require __DIR__ . '/subscriptions/views.php'; require __DIR__ . '/subscriptions/subscribe-modal/class-jetpack-subscribe-modal.php'; require __DIR__ . '/subscriptions/subscribe-overlay/class-jetpack-subscribe-overlay.php'; +require __DIR__ . '/subscriptions/subscribe-floating-button/class-jetpack-subscribe-floating-button.php'; diff --git a/projects/plugins/jetpack/modules/subscriptions/subscribe-floating-button/class-jetpack-subscribe-floating-button.php b/projects/plugins/jetpack/modules/subscriptions/subscribe-floating-button/class-jetpack-subscribe-floating-button.php new file mode 100644 index 0000000000000..09bb8ec5de85a --- /dev/null +++ b/projects/plugins/jetpack/modules/subscriptions/subscribe-floating-button/class-jetpack-subscribe-floating-button.php @@ -0,0 +1,196 @@ +get_template(); + } + } + + return $block_template; + } + + /** + * Returns a custom template for the floating Subscribe button. + * + * @return WP_Block_Template + */ + public function get_template() { + $template = new WP_Block_Template(); + $template->theme = get_stylesheet(); + $template->slug = self::BLOCK_TEMPLATE_PART_SLUG; + $template->id = self::get_block_template_part_id(); + $template->area = 'uncategorized'; + $template->content = $this->get_floating_subscribe_button_template_content(); + $template->source = 'plugin'; + $template->type = 'wp_template_part'; + $template->title = __( 'Jetpack Subscribe floating button', 'jetpack' ); + $template->status = 'publish'; + $template->has_theme_file = false; + $template->is_custom = true; + $template->description = __( 'A floating subscribe button that shows up when someone visits your site.', 'jetpack' ); + + return $template; + } + + /** + * Returns the initial content of the floating Subscribe button template. + * This can then be edited by the user. + * + * @return string + */ + public function get_floating_subscribe_button_template_content() { + $block_name = esc_attr__( 'Floating subscribe button', 'jetpack' ); + + return ''; + } + + /** + * Enqueues styles. + * + * @return void + */ + public function enqueue_assets() { + if ( $this->should_user_see_floating_button() ) { + wp_enqueue_style( 'subscribe-floating-button-css', plugins_url( 'subscribe-floating-button.css', __FILE__ ), array(), JETPACK__VERSION ); + + // Disables WP.com action bar as the features collide/overlap + add_filter( 'wpcom_disable_logged_out_follow', '__return_true', 10, 1 ); + } + } + + /** + * Adds floating Subscribe button HTML wrapper + * + * @return void + */ + public function add_subscribe_floating_button_to_frontend() { + if ( $this->should_user_see_floating_button() ) { ?> + + { const modal = document.querySelector( '.jetpack-subscribe-modal' ); const modalDismissedCookie = 'jetpack_post_subscribe_modal_dismissed'; + const skipUrlParam = 'jetpack_skip_subscription_popup'; function hasEnoughTimePassed() { const lastDismissed = localStorage.getItem( modalDismissedCookie ); return lastDismissed ? Date.now() - lastDismissed > Jetpack_Subscriptions.modalInterval : true; } - if ( ! modal || ! hasEnoughTimePassed() ) { + // Subscriber ended up here e.g. from emails: + // we won't show the modal to them in future since they most likely are already a subscriber. + function skipModal() { + const url = new URL( window.location.href ); + if ( url.searchParams.has( skipUrlParam ) ) { + url.searchParams.delete( skipUrlParam ); + window.history.replaceState( {}, '', url ); + storeCloseTimestamp(); + return true; + } + + return false; + } + + if ( ! modal || ! hasEnoughTimePassed() || skipModal() ) { return; } diff --git a/projects/plugins/jetpack/modules/subscriptions/subscribe-overlay/subscribe-overlay.css b/projects/plugins/jetpack/modules/subscriptions/subscribe-overlay/subscribe-overlay.css index 91cf3bf268738..c7ac26616b7c8 100644 --- a/projects/plugins/jetpack/modules/subscriptions/subscribe-overlay/subscribe-overlay.css +++ b/projects/plugins/jetpack/modules/subscriptions/subscribe-overlay/subscribe-overlay.css @@ -7,7 +7,7 @@ body.jetpack-subscribe-overlay-open { visibility: hidden; position: fixed; - z-index: 50000; /* Same as WP.com Action bar */ + z-index: 50001; /* WP.com Action bar and floating subscribe button are 5000 */ left: 0; top: 0; width: 100%; diff --git a/projects/plugins/jetpack/modules/subscriptions/subscribe-overlay/subscribe-overlay.js b/projects/plugins/jetpack/modules/subscriptions/subscribe-overlay/subscribe-overlay.js index 936b5840c80fb..83eae23686338 100644 --- a/projects/plugins/jetpack/modules/subscriptions/subscribe-overlay/subscribe-overlay.js +++ b/projects/plugins/jetpack/modules/subscriptions/subscribe-overlay/subscribe-overlay.js @@ -3,10 +3,25 @@ const { domReady } = wp; domReady( function () { const overlay = document.querySelector( '.jetpack-subscribe-overlay' ); const overlayDismissedCookie = 'jetpack_post_subscribe_overlay_dismissed'; + const skipUrlParam = 'jetpack_skip_subscription_popup'; const hasOverlayDismissedCookie = document.cookie && document.cookie.indexOf( overlayDismissedCookie ) > -1; - if ( ! overlay || hasOverlayDismissedCookie ) { + // Subscriber ended up here e.g. from emails: + // we won't show the overlay to them in future since they most likely are already a subscriber. + function skipOverlay() { + const url = new URL( window.location.href ); + if ( url.searchParams.has( skipUrlParam ) ) { + url.searchParams.delete( skipUrlParam ); + window.history.replaceState( {}, '', url ); + setOverlayDismissedCookie(); + return true; + } + + return false; + } + + if ( ! overlay || hasOverlayDismissedCookie || skipOverlay() ) { return; } diff --git a/projects/plugins/jetpack/modules/videopress/class.jetpack-videopress.php b/projects/plugins/jetpack/modules/videopress/class.jetpack-videopress.php index 16aaf210242b6..b82d874c7cde0 100644 --- a/projects/plugins/jetpack/modules/videopress/class.jetpack-videopress.php +++ b/projects/plugins/jetpack/modules/videopress/class.jetpack-videopress.php @@ -83,7 +83,7 @@ public function media_new_page_admin_notice() { __( 'VideoPress uploads are not supported here. To upload to VideoPress, add your videos from the Media Library or the block editor using the Video block.', 'jetpack' ), array( 'a' => array( 'href' => array() ) ) ), - esc_url( admin_url( 'upload.php' ) ) + esc_url( admin_url( 'upload.php?mode=grid&action=add-new' ) ) ); wp_admin_notice( $message, diff --git a/projects/plugins/jetpack/package.json b/projects/plugins/jetpack/package.json index 894c231112315..97da3db04ed14 100644 --- a/projects/plugins/jetpack/package.json +++ b/projects/plugins/jetpack/package.json @@ -1,6 +1,6 @@ { "name": "Jetpack", - "version": "14.0.0-a.1", + "version": "14.0.0-a.7", "private": true, "description": "[Jetpack](https://jetpack.com/) is a WordPress plugin that supercharges your self-hosted WordPress site with the awesome cloud power of [WordPress.com](https://wordpress.com).", "homepage": "https://jetpack.com", diff --git a/projects/plugins/jetpack/readme.txt b/projects/plugins/jetpack/readme.txt index 3d7d20c44db07..2ea5b8f05cca1 100644 --- a/projects/plugins/jetpack/readme.txt +++ b/projects/plugins/jetpack/readme.txt @@ -1,10 +1,10 @@ === Jetpack - WP Security, Backup, Speed, & Growth === Contributors: automattic, adamkheckler, adrianmoldovanwp, aduth, akirk, allendav, alternatekev, andy, annamcphee, annezazu, apeatling, arcangelini, arsihasi, azaozz, barry, batmoo, beaulebens, bindlegirl, biskobe, bjorsch, blobaugh, brbrr, brileyhooper, cainm, cena, cfinke, cgastrell, chaselivingston, chellycat, clickysteve, csonnek, danielbachhuber, daniloercoli, davoraltman, delawski, designsimply, dkmyta, dllh, drawmyface, dsmart, dun2mis, dzver, ebinnion, egregor, eliorivero, enej, eoigal, erania-pinnera, ethitter, fgiannar, gcorne, georgestephanis, gibrown, goldsounds, hew, hugobaeta, hypertextranch, iammattthomas, iandunn, joen, jblz, jeffgolenski, jeherve, jenhooks, jenia, jessefriedman, jgs, jkudish, jmdodd, joanrho, johnjamesjacoby, jshreve, kbrownkd, keoshi, koke, kraftbj, lancewillett, leogermani, lhkowalski, lschuyler, macmanx, martinremy, matt, mattwiebe, matveb, maverick3x6, mcsf, mdawaffe, mdbitz, MichaelArestad, migueluy, miguelxavierpenha, mikeyarce, mkaz, nancythanki, nickmomrik, njweller, nunyvega, obenland, oskosk, pento, professor44, rachelsquirrel, rdcoll, renatoagds, retrofox, richardmtl, richardmuscat, robertbpugh, roccotripaldi, ryancowles, samhotchkiss, samiff, scarstocea, scottsweb, sdixon194, sdquirk, sermitr, simison, stephdau, thehenridev, tmoorewp, tyxla, Viper007Bond, westi, williamvianas, wpkaren, yoavf, zinigor Tags: Security, backup, malware, scan, performance -Stable tag: 13.8.1 +Stable tag: 13.9.1 Requires at least: 6.5 Requires PHP: 7.0 -Tested up to: 6.6 +Tested up to: 6.7 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -326,15 +326,18 @@ Jetpack Backup can do a full website migration to a new host, migrate theme file == Changelog == -### 14.0-a.1 - 2024-10-07 +### 14.0-a.7 - 2024-10-21 #### Enhancements -- Sitemap: Improve sitemap write efficienty. -- CSS: Rely esclusively on individual CSS files instead of a combined one for the features used on each page to improve page loading. -- Social: Add support for Bluesky 🎉. -- Scan: Update Jetpack Scan link in the WP Admin menu. +- Newsletters: Add an email preview option to the preview menu. +- Newsletters: Allow skipping newsletter modals with a URL query param. + +#### Improved compatibility +- General: Ensure notice displays without errors when running an old version of WordPress. +- Plugin action links filters: Update parameter to avoid conflicts with other plugins. #### Bug fixes -- Social: Prevent text overflow in the share status tooltip. +- Map Block: Fix issue where blocks placed underneath would overlap with the map block. +- Newsletters: Fix "Use excerpt" setting. -------- diff --git a/projects/plugins/jetpack/tests/php/general/test_jetpack-admin-menu.php b/projects/plugins/jetpack/tests/php/general/test_jetpack-admin-menu.php index 7c26ad0aca3f0..c4d0a6983443a 100644 --- a/projects/plugins/jetpack/tests/php/general/test_jetpack-admin-menu.php +++ b/projects/plugins/jetpack/tests/php/general/test_jetpack-admin-menu.php @@ -87,20 +87,19 @@ public function test_jetpack_admin_menu_order() { // Some sites - multisites / WoA for example - may not have all of the menu items. if ( in_array( 'My Jetpack', $submenu_names, true ) ) { $my_jetpack_submenu_position = array_search( 'My Jetpack', $submenu_names, true ); - $this->assertTrue( $my_jetpack_submenu_position < $stats_submenu_position, 'My Jetpack should be above Stats in the submenu order.' ); + $this->assertLessThan( $stats_submenu_position, $my_jetpack_submenu_position, 'My Jetpack should be above Stats in the submenu order.' ); } if ( in_array( 'Activity Log', $submenu_names, true ) ) { $activity_log_submenu_position = array_search( 'Activity Log', $submenu_names, true ); - $this->assertTrue( $activity_log_submenu_position < $search_submenu_position, 'Activity Log should be above Search in the submenu order.' ); - $this->assertTrue( $backup_submenu_position < $activity_log_submenu_position, 'Jetpack VaultPress Backup should be above Activity Log in the submenu order.' ); + $this->assertLessThan( $search_submenu_position, $activity_log_submenu_position, 'Activity Log should be above Search in the submenu order.' ); + $this->assertLessThan( $activity_log_submenu_position, $backup_submenu_position, 'Jetpack VaultPress Backup should be above Activity Log in the submenu order.' ); } - - $this->assertTrue( $stats_submenu_position < $videopress_submenu_position, 'Stats should be above VideoPress in the submenu order.' ); - $this->assertTrue( $videopress_submenu_position < $backup_submenu_position, 'Jetpack VideoPress should be above Jetpack VaultPress Backup in the submenu order.' ); - $this->assertTrue( $backup_submenu_position < $search_submenu_position, 'Jetpack VaultPress Backup should be above Search in the submenu order.' ); - $this->assertTrue( $search_submenu_position < $wordads_submenu_position, 'Search should be above WordAds in the submenu order.' ); - $this->assertTrue( $wordads_submenu_position < $settings_submenu_position, 'WordAds should be above Settings in the submenu order.' ); - $this->assertTrue( $settings_submenu_position < $dashboard_submenu_position, 'Settings should be above Dashboard in the submenu order.' ); + $this->assertLessThan( $videopress_submenu_position, $stats_submenu_position, 'Stats should be above VideoPress in the submenu order.' ); + $this->assertLessThan( $backup_submenu_position, $videopress_submenu_position, 'Jetpack VideoPress should be above Jetpack VaultPress Backup in the submenu order.' ); + $this->assertLessThan( $search_submenu_position, $backup_submenu_position, 'Jetpack VaultPress Backup should be above Search in the submenu order.' ); + $this->assertLessThan( $wordads_submenu_position, $search_submenu_position, 'Search should be above WordAds in the submenu order.' ); + $this->assertLessThan( $settings_submenu_position, $wordads_submenu_position, 'WordAds should be above Settings in the submenu order.' ); + $this->assertLessThan( $dashboard_submenu_position, $settings_submenu_position, 'Settings should be above Dashboard in the submenu order.' ); } } diff --git a/projects/plugins/jetpack/tests/php/sync/test_class.jetpack-sync-options.php b/projects/plugins/jetpack/tests/php/sync/test_class.jetpack-sync-options.php index 75282db8c96e8..e7c4cd66c1a03 100644 --- a/projects/plugins/jetpack/tests/php/sync/test_class.jetpack-sync-options.php +++ b/projects/plugins/jetpack/tests/php/sync/test_class.jetpack-sync-options.php @@ -91,6 +91,7 @@ public function test_sync_default_options() { 'stc_enabled' => false, 'sm_enabled' => false, 'jetpack_subscribe_overlay_enabled' => false, + 'jetpack_subscribe_floating_button_enabled' => false, 'jetpack_subscriptions_subscribe_post_end_enabled' => false, 'jetpack_subscriptions_login_navigation_enabled' => false, 'jetpack_subscriptions_subscribe_navigation_enabled' => false, @@ -277,7 +278,6 @@ public function test_sync_default_options() { 'jetpack_waf_share_data' => true, 'jetpack_waf_share_debug_data' => false, 'jetpack_waf_automatic_rules_last_updated_timestamp' => 0, - 'woocommerce_analytics_first_activation' => false, ); $theme_mod_key = 'theme_mods_' . get_option( 'stylesheet' ); diff --git a/projects/plugins/jetpack/to-test.md b/projects/plugins/jetpack/to-test.md index 17612f968e23d..0b898396b9eb5 100644 --- a/projects/plugins/jetpack/to-test.md +++ b/projects/plugins/jetpack/to-test.md @@ -10,9 +10,33 @@ - Or add the following to something like a code snippet plugin: `add_filter( 'jetpack_blocks_variation', function () { return 'beta'; } );` - To test Breve further in the document please enable the feature with the following snippet: `add_filter( 'breve_enabled', '__return_true' );` -### Your Feature +### AI Logo Generator -Add testing instructions below. +On top of the already available AI Logo generator, we've now added a styles dropdown to allow more control for the user without depending entirely on the provided prompt. + +The logo generator is not available for free users, test with a plan or subscription. Also, it's currenlty available for a12s (and will soon be open to public), but if you need to test with another account and have access to a sandbox, you can add a filter to enable the styles on your 0-sandbox.php file: `add_filter( 'jetpack_ai_logo_style_selector_enabled', '__return_true' );` + +- Load the editor and add a Logo block. +- On the network tab you should see a request to `ai-assistant-feature` + - If using an a11n account (or focing the filter to `true`), the response should include `featuresControl['logo-generator'].styles` as a collection of style objects. + - If NOT using an a11n account, the `styles` property should be an empty array. +``` +{ + ... + featuresControl: { + 'logo-generator': { + enabled: true, + styles: [ COLLECTION OF SYLES HERE ] + } + } +} +``` +- Use the block's AI toolbar button to open the Logo generator modal, you should see a style dropdown on the top-right corner +- Feel free to play with the styles to achieve different results +- Confirm that using style "Auto" will try to guess the style based on the prompt (AI query request) and set the style prior to sending the image generation request +- If possible, try different combinations of plans and cases: + - use `add_filter( 'jetpack_ai_tier_licensed_quantity', function() { return 0 | 100 | 1; } );` filter to mock free/tier100/unlimited plans + - sandbox the API, but then don't connect to sandbox to mock a disconnected situation ### And More! diff --git a/projects/plugins/migration/changelog/fix-sync-filter-null-array b/projects/plugins/migration/changelog/fix-sync-filter-null-array new file mode 100644 index 0000000000000..3f56c90b3a7bf --- /dev/null +++ b/projects/plugins/migration/changelog/fix-sync-filter-null-array @@ -0,0 +1,5 @@ +Significance: patch +Type: fixed +Comment: Sync: update filter parameter to avoid conflicts with other plugins. + + diff --git a/projects/plugins/migration/changelog/update-tested-to-6-7 b/projects/plugins/migration/changelog/update-tested-to-6-7 new file mode 100644 index 0000000000000..9c1d5b4fabb5f --- /dev/null +++ b/projects/plugins/migration/changelog/update-tested-to-6-7 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: indicate compatibility with the upcoming version of WordPress - 6.7. diff --git a/projects/plugins/migration/readme.txt b/projects/plugins/migration/readme.txt index e841038dff934..0b5da1d9329a0 100644 --- a/projects/plugins/migration/readme.txt +++ b/projects/plugins/migration/readme.txt @@ -3,7 +3,7 @@ Contributors: automattic Tags: migrate, migration, backup, restore, transfer, move, copy, wordpress.com, automattic, import, importer, hosting Requires at least: 6.5 Requires PHP: 7.0 -Tested up to: 6.6 +Tested up to: 6.7 Stable tag: 2.0.0 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html diff --git a/projects/plugins/mu-wpcom-plugin/changelog/fix-sync-filter-null-array b/projects/plugins/mu-wpcom-plugin/changelog/fix-sync-filter-null-array new file mode 100644 index 0000000000000..3f56c90b3a7bf --- /dev/null +++ b/projects/plugins/mu-wpcom-plugin/changelog/fix-sync-filter-null-array @@ -0,0 +1,5 @@ +Significance: patch +Type: fixed +Comment: Sync: update filter parameter to avoid conflicts with other plugins. + + diff --git a/projects/plugins/protect/CHANGELOG.md b/projects/plugins/protect/CHANGELOG.md index 2d62a2704ea7c..5d28f47c723b4 100644 --- a/projects/plugins/protect/CHANGELOG.md +++ b/projects/plugins/protect/CHANGELOG.md @@ -5,6 +5,25 @@ 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). +## 3.1.1 - 2024-10-17 +### Changed +- Firewall: Fix backwards compatibility for sites running standalone mode with outdated packages autoloaded. + +## 3.1.0 - 2024-10-15 +### Added +- Firewall: Adds stat cards showing recent block counts [#35739] +- Auto-Fixers: Adds handling for long-running fixers [#39301] + +### Changed +- Firewall: added help text for IP list formatting rules [#39448] +- Updated package dependencies. [#39707] + +### Removed +- Security Scanning: disabled database threat category [#39467] + +### Fixed +- Minor fixes and improvements. + ## 3.0.2 - 2024-09-06 ### Changed - Internal updates. diff --git a/projects/plugins/protect/changelog/add-dependency-extraction-auto-polyfill b/projects/plugins/protect/changelog/add-dependency-extraction-auto-polyfill deleted file mode 100644 index f4cd286e166af..0000000000000 --- a/projects/plugins/protect/changelog/add-dependency-extraction-auto-polyfill +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Only include `wp-polyfill` as a script dependency when needed. diff --git a/projects/plugins/protect/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return b/projects/plugins/protect/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return deleted file mode 100644 index 7f30b15d5fb4c..0000000000000 --- a/projects/plugins/protect/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: changed -Comment: Rearranged some variable assignments for new eslint `@wordpress/no-unused-vars-before-return` rule. Should be no changes to functionality. - - diff --git a/projects/plugins/protect/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return#2 b/projects/plugins/protect/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return#2 deleted file mode 100644 index d004f38abd24f..0000000000000 --- a/projects/plugins/protect/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return#2 +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: changed -Comment: Something was needed to avoid optimization breaking the i18n with the rearranged code, and these seemed like they could use some context anyway. - -Added context to i18n messages "Low", "High", and "Critical". diff --git a/projects/plugins/protect/changelog/add-eslint-react-jsx-key b/projects/plugins/protect/changelog/add-eslint-react-jsx-key deleted file mode 100644 index 9c48272a94f90..0000000000000 --- a/projects/plugins/protect/changelog/add-eslint-react-jsx-key +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: fixed -Comment: Add `key` to some React `actions` props. Should be no change to functionality. - - diff --git a/projects/plugins/protect/changelog/add-features-enabled-rest-endpoint b/projects/plugins/protect/changelog/add-features-enabled-rest-endpoint deleted file mode 100644 index 57cf25c290a35..0000000000000 --- a/projects/plugins/protect/changelog/add-features-enabled-rest-endpoint +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: removed - -Connection: Removed features_enabled deprecated method diff --git a/projects/plugins/protect/changelog/add-protect-firewall-stat-cards b/projects/plugins/protect/changelog/add-protect-firewall-stat-cards deleted file mode 100644 index 244645fa6ebd6..0000000000000 --- a/projects/plugins/protect/changelog/add-protect-firewall-stat-cards +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: added - -Added WAF StatCards for blocked requests diff --git a/projects/plugins/protect/changelog/add-protect-firewall-stat-cards#2 b/projects/plugins/protect/changelog/add-protect-firewall-stat-cards#2 deleted file mode 100644 index 9aa70e3ec1f75..0000000000000 --- a/projects/plugins/protect/changelog/add-protect-firewall-stat-cards#2 +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: changed -Comment: Updated composer.lock. - - diff --git a/projects/plugins/protect/changelog/add-protect-fixer-status-to-initial-state b/projects/plugins/protect/changelog/add-protect-fixer-status-to-initial-state deleted file mode 100644 index 460c195f87dad..0000000000000 --- a/projects/plugins/protect/changelog/add-protect-fixer-status-to-initial-state +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: changed - -Adds fixer status to the initial state diff --git a/projects/plugins/protect/changelog/add-protect-header-component b/projects/plugins/protect/changelog/add-protect-header-component new file mode 100644 index 0000000000000..6276c489253c7 --- /dev/null +++ b/projects/plugins/protect/changelog/add-protect-header-component @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +Adds and applies a shared Header component diff --git a/projects/plugins/protect/changelog/add-protect-ip-list-formatting-description b/projects/plugins/protect/changelog/add-protect-ip-list-formatting-description deleted file mode 100644 index e735fbfc9161d..0000000000000 --- a/projects/plugins/protect/changelog/add-protect-ip-list-formatting-description +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Firewall: added help text for IP list formatting rules diff --git a/projects/plugins/protect/changelog/add-protect-tanstack-query b/projects/plugins/protect/changelog/add-protect-tanstack-query deleted file mode 100644 index 8499ce03ae272..0000000000000 --- a/projects/plugins/protect/changelog/add-protect-tanstack-query +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: added -Comment: Added react query, no user-facing impact. - - diff --git a/projects/plugins/protect/changelog/add-restful-features-available b/projects/plugins/protect/changelog/add-restful-features-available deleted file mode 100644 index 152ef1efc4b7f..0000000000000 --- a/projects/plugins/protect/changelog/add-restful-features-available +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: removed - -Connection: Removed deprecated method features_available diff --git a/projects/plugins/protect/changelog/fix-protect-credentials-refetch-interval b/projects/plugins/protect/changelog/fix-protect-credentials-refetch-interval new file mode 100644 index 0000000000000..3ae06ab163288 --- /dev/null +++ b/projects/plugins/protect/changelog/fix-protect-credentials-refetch-interval @@ -0,0 +1,5 @@ +Significance: patch +Type: fixed +Comment: Fixed background refreshing of data when credentials modal opened. + + diff --git a/projects/plugins/protect/changelog/fix-protect-last-checked-conversions b/projects/plugins/protect/changelog/fix-protect-last-checked-conversions deleted file mode 100644 index e2a903b5304db..0000000000000 --- a/projects/plugins/protect/changelog/fix-protect-last-checked-conversions +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Fixes lastChecked conversions diff --git a/projects/plugins/protect/changelog/fix-protect-overwritten-waf-subheading-updates b/projects/plugins/protect/changelog/fix-protect-overwritten-waf-subheading-updates deleted file mode 100644 index 16b7e542600bd..0000000000000 --- a/projects/plugins/protect/changelog/fix-protect-overwritten-waf-subheading-updates +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Reapplies overwritten FirewallSubheading component updates diff --git a/projects/plugins/protect/changelog/fix-protect-stats-property-naming b/projects/plugins/protect/changelog/fix-protect-stats-property-naming deleted file mode 100644 index 7988ecde8d81b..0000000000000 --- a/projects/plugins/protect/changelog/fix-protect-stats-property-naming +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Fixes blockedRequests destructuring fallback diff --git a/projects/plugins/protect/changelog/prerelease b/projects/plugins/protect/changelog/prerelease deleted file mode 100644 index 9aa70e3ec1f75..0000000000000 --- a/projects/plugins/protect/changelog/prerelease +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: changed -Comment: Updated composer.lock. - - diff --git a/projects/plugins/protect/changelog/prerelease#2 b/projects/plugins/protect/changelog/prerelease#2 deleted file mode 100644 index 9aa70e3ec1f75..0000000000000 --- a/projects/plugins/protect/changelog/prerelease#2 +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: changed -Comment: Updated composer.lock. - - diff --git a/projects/plugins/protect/changelog/prerelease#3 b/projects/plugins/protect/changelog/prerelease#3 deleted file mode 100644 index 9aa70e3ec1f75..0000000000000 --- a/projects/plugins/protect/changelog/prerelease#3 +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: changed -Comment: Updated composer.lock. - - diff --git a/projects/plugins/protect/changelog/prerelease#4 b/projects/plugins/protect/changelog/prerelease#4 deleted file mode 100644 index 9aa70e3ec1f75..0000000000000 --- a/projects/plugins/protect/changelog/prerelease#4 +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: changed -Comment: Updated composer.lock. - - diff --git a/projects/plugins/protect/changelog/prerelease#5 b/projects/plugins/protect/changelog/prerelease#5 deleted file mode 100644 index 9aa70e3ec1f75..0000000000000 --- a/projects/plugins/protect/changelog/prerelease#5 +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: changed -Comment: Updated composer.lock. - - diff --git a/projects/plugins/protect/changelog/prerelease#6 b/projects/plugins/protect/changelog/prerelease#6 deleted file mode 100644 index 9aa70e3ec1f75..0000000000000 --- a/projects/plugins/protect/changelog/prerelease#6 +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: changed -Comment: Updated composer.lock. - - diff --git a/projects/plugins/protect/changelog/prerelease#7 b/projects/plugins/protect/changelog/prerelease#7 deleted file mode 100644 index 9aa70e3ec1f75..0000000000000 --- a/projects/plugins/protect/changelog/prerelease#7 +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: changed -Comment: Updated composer.lock. - - diff --git a/projects/plugins/protect/changelog/prerelease#8 b/projects/plugins/protect/changelog/prerelease#8 deleted file mode 100644 index 9aa70e3ec1f75..0000000000000 --- a/projects/plugins/protect/changelog/prerelease#8 +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: changed -Comment: Updated composer.lock. - - diff --git a/projects/plugins/protect/changelog/prerelease#9 b/projects/plugins/protect/changelog/prerelease#9 deleted file mode 100644 index 9aa70e3ec1f75..0000000000000 --- a/projects/plugins/protect/changelog/prerelease#9 +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: changed -Comment: Updated composer.lock. - - diff --git a/projects/plugins/protect/changelog/remove-protect-database-results b/projects/plugins/protect/changelog/remove-protect-database-results deleted file mode 100644 index ff0dc3ea3a23c..0000000000000 --- a/projects/plugins/protect/changelog/remove-protect-database-results +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: removed - -Security Scanning: disabled database threat category diff --git a/projects/plugins/protect/changelog/renovate-lock-file-maintenance b/projects/plugins/protect/changelog/renovate-lock-file-maintenance deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/plugins/protect/changelog/renovate-lock-file-maintenance +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/plugins/protect/changelog/renovate-lock-file-maintenance#2 b/projects/plugins/protect/changelog/renovate-lock-file-maintenance#2 deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/plugins/protect/changelog/renovate-lock-file-maintenance#2 +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/plugins/protect/changelog/renovate-lock-file-maintenance#3 b/projects/plugins/protect/changelog/renovate-lock-file-maintenance#3 deleted file mode 100644 index 9aa70e3ec1f75..0000000000000 --- a/projects/plugins/protect/changelog/renovate-lock-file-maintenance#3 +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: changed -Comment: Updated composer.lock. - - diff --git a/projects/plugins/protect/changelog/renovate-wordpress-monorepo b/projects/plugins/protect/changelog/renovate-wordpress-monorepo deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/plugins/protect/changelog/renovate-wordpress-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/plugins/protect/changelog/renovate-wordpress-monorepo#2 b/projects/plugins/protect/changelog/renovate-wordpress-monorepo#2 deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/plugins/protect/changelog/renovate-wordpress-monorepo#2 +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/plugins/protect/changelog/renovate-wordpress-monorepo#3 b/projects/plugins/protect/changelog/renovate-wordpress-monorepo#3 deleted file mode 100644 index c47cb18e82997..0000000000000 --- a/projects/plugins/protect/changelog/renovate-wordpress-monorepo#3 +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies. diff --git a/projects/plugins/protect/changelog/update-my-jetpack-notice-mobile-style b/projects/plugins/protect/changelog/update-my-jetpack-notice-mobile-style deleted file mode 100644 index c740afea846ef..0000000000000 --- a/projects/plugins/protect/changelog/update-my-jetpack-notice-mobile-style +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fixed - -My Jetpack: visual update to the GlobalNotice component look better on mobile. diff --git a/projects/plugins/protect/changelog/update-protect-fixer-ui-to-handle-long-running-fixers b/projects/plugins/protect/changelog/update-protect-fixer-ui-to-handle-long-running-fixers deleted file mode 100644 index d8f2fd52d4ce2..0000000000000 --- a/projects/plugins/protect/changelog/update-protect-fixer-ui-to-handle-long-running-fixers +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: added - -Adds handling for long running fixers diff --git a/projects/plugins/protect/changelog/update-protect-minor-component-refactors b/projects/plugins/protect/changelog/update-protect-minor-component-refactors deleted file mode 100644 index 81a8cf4144ea1..0000000000000 --- a/projects/plugins/protect/changelog/update-protect-minor-component-refactors +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: changed -Comment: Minor refactoring of JS organization. - - diff --git a/projects/plugins/protect/changelog/update-protect-optimistically-scanning b/projects/plugins/protect/changelog/update-protect-optimistically-scanning deleted file mode 100644 index 35a9a6afb5f74..0000000000000 --- a/projects/plugins/protect/changelog/update-protect-optimistically-scanning +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: changed - -Improves optimistic scanning diff --git a/projects/plugins/protect/changelog/update-protect-use-fixers-response-error-prop-handling b/projects/plugins/protect/changelog/update-protect-use-fixers-response-error-prop-handling deleted file mode 100644 index 75eea85cd389a..0000000000000 --- a/projects/plugins/protect/changelog/update-protect-use-fixers-response-error-prop-handling +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Adds handling for FixerStatus error props diff --git a/projects/plugins/protect/changelog/update-tested-to-6-7 b/projects/plugins/protect/changelog/update-tested-to-6-7 new file mode 100644 index 0000000000000..9c1d5b4fabb5f --- /dev/null +++ b/projects/plugins/protect/changelog/update-tested-to-6-7 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: indicate compatibility with the upcoming version of WordPress - 6.7. diff --git a/projects/plugins/protect/changelog/update-wordpress-eslint-plugin b/projects/plugins/protect/changelog/update-wordpress-eslint-plugin deleted file mode 100644 index e832c1048f84f..0000000000000 --- a/projects/plugins/protect/changelog/update-wordpress-eslint-plugin +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fixed - -Move leading and trailing spaces out of i18n messages. diff --git a/projects/plugins/protect/composer.json b/projects/plugins/protect/composer.json index 2a97ac6fd86dc..f596dd2a423e3 100644 --- a/projects/plugins/protect/composer.json +++ b/projects/plugins/protect/composer.json @@ -79,6 +79,6 @@ "automattic/jetpack-autoloader": true, "automattic/jetpack-composer-plugin": true }, - "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_protectⓥ3_0_2" + "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_protectⓥ3_1_1" } } diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock index 9fa2d9b26c0d0..b78911016670e 100644 --- a/projects/plugins/protect/composer.lock +++ b/projects/plugins/protect/composer.lock @@ -1803,7 +1803,7 @@ "dist": { "type": "path", "url": "../../packages/waf", - "reference": "79fb7681c1964694ba0200b2a70e18ed35c14bfe" + "reference": "44068e3c71aa5634458967a6191535ba25c51639" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1830,7 +1830,7 @@ "link-template": "https://github.com/Automattic/jetpack-waf/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "0.21.x-dev" + "dev-trunk": "0.22.x-dev" } }, "autoload": { diff --git a/projects/plugins/protect/jetpack-protect.php b/projects/plugins/protect/jetpack-protect.php index dda7f1891ccb3..b46915aa11def 100644 --- a/projects/plugins/protect/jetpack-protect.php +++ b/projects/plugins/protect/jetpack-protect.php @@ -3,7 +3,7 @@ * Plugin Name: Jetpack Protect * Plugin URI: https://wordpress.org/plugins/jetpack-protect * Description: Security tools that keep your site safe and sound, from posts to plugins. - * Version: 3.0.2 + * Version: 3.1.1 * Author: Automattic - Jetpack Security team * Author URI: https://jetpack.com/protect/ * License: GPLv2 or later @@ -32,7 +32,7 @@ exit; } -define( 'JETPACK_PROTECT_VERSION', '3.0.2' ); +define( 'JETPACK_PROTECT_VERSION', '3.1.1' ); define( 'JETPACK_PROTECT_DIR', plugin_dir_path( __FILE__ ) ); define( 'JETPACK_PROTECT_ROOT_FILE', __FILE__ ); define( 'JETPACK_PROTECT_ROOT_FILE_RELATIVE_PATH', plugin_basename( __FILE__ ) ); diff --git a/projects/plugins/protect/package.json b/projects/plugins/protect/package.json index a2c54875837ba..257979fa86ad8 100644 --- a/projects/plugins/protect/package.json +++ b/projects/plugins/protect/package.json @@ -41,7 +41,6 @@ "@wordpress/url": "4.9.0", "camelize": "1.0.1", "clsx": "2.1.1", - "diff": "^4.0.2", "moment": "2.29.4", "prop-types": "15.8.1", "react": "18.3.1", diff --git a/projects/plugins/protect/readme.txt b/projects/plugins/protect/readme.txt index f56092fdc102f..7d2253fff1a8c 100644 --- a/projects/plugins/protect/readme.txt +++ b/projects/plugins/protect/readme.txt @@ -3,7 +3,7 @@ Contributors: automattic, retrofox, leogermani, renatoagds, bjorsch, ebinnion, f Tags: jetpack, protect, security, malware, scan Requires at least: 6.5 Requires PHP: 7.0 -Tested up to: 6.6 +Tested up to: 6.7 Stable tag: 1.4.1 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -178,7 +178,7 @@ The new Jetpack Protect plugin is different from the Jetpack feature formerly kn 4. The Jetpack Firewall is a web application firewall (known as WAF) designed to protect your WordPress site from malicious requests. == Changelog == -### 3.0.2 - 2024-09-06 +### 3.1.1 - 2024-10-17 #### Changed -- Internal updates. +- Firewall: Fix backwards compatibility for sites running standalone mode with outdated packages autoloaded. diff --git a/projects/plugins/protect/src/class-scan-history.php b/projects/plugins/protect/src/class-scan-history.php index 1533402ea9c79..de88b135778cc 100644 --- a/projects/plugins/protect/src/class-scan-history.php +++ b/projects/plugins/protect/src/class-scan-history.php @@ -182,7 +182,10 @@ public static function fetch_from_api() { $response = Client::wpcom_json_api_request_as_blog( $api_url, '2', - array( 'method' => 'GET' ), + array( + 'method' => 'GET', + 'timeout' => 30, + ), null, 'wpcom' ); diff --git a/projects/plugins/protect/src/js/api.ts b/projects/plugins/protect/src/js/api.ts index 6bcef53838e09..9d95ab07279fc 100644 --- a/projects/plugins/protect/src/js/api.ts +++ b/projects/plugins/protect/src/js/api.ts @@ -49,11 +49,11 @@ const API = { data: { step_ids: stepIds }, } ), - getScanHistory: (): Promise< ScanStatus > => + getScanHistory: (): Promise< ScanStatus | false > => apiFetch( { path: 'jetpack-protect/v1/scan-history', method: 'GET', - } ).then( camelize ) as Promise< ScanStatus >, + } ).then( camelize ), scan: () => apiFetch( { diff --git a/projects/plugins/protect/src/js/components/admin-page/index.jsx b/projects/plugins/protect/src/js/components/admin-page/index.jsx index bdeee21f24b77..b4ef8c24bad6d 100644 --- a/projects/plugins/protect/src/js/components/admin-page/index.jsx +++ b/projects/plugins/protect/src/js/components/admin-page/index.jsx @@ -1,11 +1,14 @@ -import { AdminPage as JetpackAdminPage, Container } from '@automattic/jetpack-components'; +import { + AdminPage as JetpackAdminPage, + Container, + JetpackProtectLogo, +} from '@automattic/jetpack-components'; import { useConnection } from '@automattic/jetpack-connection'; import { __ } from '@wordpress/i18n'; import { useEffect } from 'react'; import { useNavigate } from 'react-router-dom'; import useNotices from '../../hooks/use-notices'; import useWafData from '../../hooks/use-waf-data'; -import Logo from '../logo'; import Notice from '../notice'; import Tabs, { Tab } from '../tabs'; import styles from './styles.module.scss'; @@ -28,7 +31,10 @@ const AdminPage = ( { children } ) => { } return ( -}> + } + > { notice && } diff --git a/projects/plugins/protect/src/js/routes/scan/scan-section-notices.tsx b/projects/plugins/protect/src/js/components/admin-section-hero/admin-section-hero-notices.tsx similarity index 55% rename from projects/plugins/protect/src/js/routes/scan/scan-section-notices.tsx rename to projects/plugins/protect/src/js/components/admin-section-hero/admin-section-hero-notices.tsx index c29b5fb36b677..6ca6a33c1cc78 100644 --- a/projects/plugins/protect/src/js/routes/scan/scan-section-notices.tsx +++ b/projects/plugins/protect/src/js/components/admin-section-hero/admin-section-hero-notices.tsx @@ -1,15 +1,8 @@ -import { Col, Container } from '@automattic/jetpack-components'; -import { ConnectionError, useConnectionErrorNotice } from '@automattic/jetpack-connection'; +import { Container, Col } from '@automattic/jetpack-components'; +import { useConnectionErrorNotice, ConnectionError } from '@automattic/jetpack-connection'; import styles from './styles.module.scss'; -/** - * Scan Section Notices - * - * Component that renders the connection error notice and the Jetpack admin notices. - * - * @return {Component} The component. - */ -export default function ScanSectionNotices() { +const AdminSectionHeroNotices: React.FC = () => { const { hasConnectionError } = useConnectionErrorNotice(); return ( @@ -24,4 +17,6 @@ export default function ScanSectionNotices() { + + ); +}; + +AdminSectionHero.Heading = ( { + children, + showIcon = false, +}: { + children: React.ReactNode; + showIcon?: boolean; +} ) => { + const Icon = getIconBySlug( 'protect' ); + + return ( ++ + + { children } + { showIcon &&
+ ); +}; + +AdminSectionHero.Subheading = ( { children }: { children: React.ReactNode } ) => { + return} + { children }; +}; + +export default AdminSectionHero; diff --git a/projects/plugins/protect/src/js/components/admin-section-hero/stories/index.stories.jsx b/projects/plugins/protect/src/js/components/admin-section-hero/stories/index.stories.jsx new file mode 100644 index 0000000000000..df9da6ce02d5e --- /dev/null +++ b/projects/plugins/protect/src/js/components/admin-section-hero/stories/index.stories.jsx @@ -0,0 +1,22 @@ +import { Status, Text } from '@automattic/jetpack-components'; +import AdminSectionHero from '..'; +import inProgressImage from '../../../../../assets/images/in-progress.png'; + +export default { + title: 'Plugins/Protect/AdminSectionHero', + component: AdminSectionHero, +}; + +export const Default = args =>; +Default.args = { + main: ( + <> + + { 'No threats found' } ++ + + ), + secondary:{ 'Most recent results' } +, +}; diff --git a/projects/plugins/protect/src/js/components/admin-section-hero/styles.module.scss b/projects/plugins/protect/src/js/components/admin-section-hero/styles.module.scss new file mode 100644 index 0000000000000..5881bcd910045 --- /dev/null +++ b/projects/plugins/protect/src/js/components/admin-section-hero/styles.module.scss @@ -0,0 +1,26 @@ +.header-main { + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-start; +} + +.header-secondary { + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-end; +} + +.heading-icon { + margin-left: var( --spacing-base ); // 8px + margin-bottom: calc( var( --spacing-base ) / 2 * -1 ); // -4px +} + +.subheading { + width: fit-content; +} + +.connection-error-col { + margin-top: calc( var( --spacing-base ) * 3 + 1px ); // 25px +} \ No newline at end of file diff --git a/projects/plugins/protect/src/js/components/diff-viewer/index.jsx b/projects/plugins/protect/src/js/components/diff-viewer/index.jsx deleted file mode 100644 index 2f26a4ae9c19b..0000000000000 --- a/projects/plugins/protect/src/js/components/diff-viewer/index.jsx +++ /dev/null @@ -1,156 +0,0 @@ -import { parsePatch } from 'diff/lib/patch/parse'; -import { Fragment } from 'react'; -import styles from './styles.module.scss'; - -const decompose = path => { - const lastSlash = path.lastIndexOf( '/' ); - - return lastSlash > -1 ? [ path.slice( 0, lastSlash ), path.slice( lastSlash ) ] : [ '', path ]; -}; - -/** - * Uses a heuristic to return proper file name indicators - * - * This function lists the filenames for the left and right - * side of the diff in a single string. - * - * It searches for the longest shared prefix and returns - * whatever remains after that. If the paths are identical - * it only returns a single filename as we have detected - * that the diff compares changes to only one file. - * - * An exception is made for `a/` and `b/` prefixes often - * added by `git` and other utilities to separate the left - * from the right when looking at the contents of a single - * file over time. - * - * @param {object} options - deconstructed argument - * @param {string} options.oldFileName - filename of left contents - * @param {string} options.newFileName - filename of right contents - * @return {window.Element} description of the file or files in the diff - */ -const filename = ( { oldFileName, newFileName } ) => { - // if we think the diff utility added a bogus - // prefix then cut it off - const isLikelyPrefixed = - 'a' === oldFileName[ 0 ] && - '/' === oldFileName[ 1 ] && - 'b' === newFileName[ 0 ] && - '/' === newFileName[ 1 ]; - - const [ prev, next ] = isLikelyPrefixed - ? [ oldFileName.slice( 2 ), newFileName.slice( 2 ) ] - : [ oldFileName, newFileName ]; - - if ( prev === next ) { - const [ base, name ] = decompose( prev ); - - // it's the same file, return the single name - return ( -
- { base && { base } } - { name } - - ); - } - - // find the longest shared path prefix - const length = Math.max( prev.length, next.length ); - for ( let i = 0, slash = 0; i < length; i++ ) { - if ( prev[ i ] === '/' && next[ i ] === '/' ) { - slash = i; - } - - if ( prev[ i ] !== next[ i ] ) { - return ( -- { slash !== 0 && ( - - { prev.slice( 0, slash ) } - - ) } - { prev.slice( slash ) } - { ' → ' } - { slash !== 0 && ( - - { next.slice( 0, slash ) } - - ) } - { next.slice( slash ) } - - ); - } - } - - // otherwise we have no shared prefix - const [ prevBase, prevName ] = decompose( prev ); - const [ nextBase, nextName ] = decompose( next ); - - return ( -- { prevBase && { prevBase } } - { prevName } - { ' → ' } - { nextBase && { nextBase } } - { nextName } - - ); -}; - -export const DiffViewer = ( { diff } ) => ( -- { parsePatch( diff ).map( ( file, fileIndex ) => ( --); - -export default DiffViewer; diff --git a/projects/plugins/protect/src/js/components/diff-viewer/stories/index.stories.jsx b/projects/plugins/protect/src/js/components/diff-viewer/stories/index.stories.jsx deleted file mode 100644 index 22968cb1e33f8..0000000000000 --- a/projects/plugins/protect/src/js/components/diff-viewer/stories/index.stories.jsx +++ /dev/null @@ -1,25 +0,0 @@ -/* eslint-disable react/react-in-jsx-scope */ -import React from 'react'; -import DiffViewer from '../index.jsx'; - -export default { - title: 'Plugins/Protect/Diff Viewer', - component: DiffViewer, -}; - -const diff = `index 51455bdb14..bc0622d001 100644 ---- a/circle.yml -+++ b/circle.yml -@@ -1,6 +1,6 @@ - machine: - node: -- version: 8.9.4 -+ version: 8.11.0 - test: - pre: - - ? |`; - -export const Default = args =>- - ) ) } -- { filename( file ) } ----- { file.hunks.map( ( hunk, hunkIndex ) => { - let lineOffset = 0; - return hunk.lines.map( ( line, index ) => ( --- { line[ 0 ] === '+' ? '\u00a0' : hunk.oldStart + lineOffset++ } -- ) ); - } ) } -- { file.hunks.map( ( hunk, hunkIndex ) => { - let lineOffset = 0; - return hunk.lines.map( ( line, index ) => ( --- { line[ 0 ] === '-' ? '\u00a0' : hunk.newStart + lineOffset++ } -- ) ); - } ) } -- { file.hunks.map( ( hunk, hunkIndex ) => - hunk.lines.map( ( line, index ) => { - const output = line.slice( 1 ).replace( /^\s*$/, '\u00a0' ); - const key = `${ hunkIndex }-${ index }`; - - switch ( line[ 0 ] ) { - case ' ': - return-{ output }; - - case '-': - return{ output }; - - case '+': - return { output }; - - default: - return undefined; - } - } ) - ) } -; -Default.args = { - diff, -}; diff --git a/projects/plugins/protect/src/js/components/error-admin-section-hero/index.tsx b/projects/plugins/protect/src/js/components/error-admin-section-hero/index.tsx new file mode 100644 index 0000000000000..f199fa92d9f29 --- /dev/null +++ b/projects/plugins/protect/src/js/components/error-admin-section-hero/index.tsx @@ -0,0 +1,51 @@ +import { Text } from '@automattic/jetpack-components'; +import { __ } from '@wordpress/i18n'; +import { Icon, warning } from '@wordpress/icons'; +import inProgressImage from '../../../../assets/images/in-progress.png'; +import AdminSectionHero from '../admin-section-hero'; +import ScanNavigation from '../scan-navigation'; +import styles from './styles.module.scss'; + +interface ErrorAdminSectionHeroProps { + baseErrorMessage: string; + errorMessage?: string; + errorCode?: string; +} + +const ErrorAdminSectionHero: React.FC< ErrorAdminSectionHeroProps > = ( { + baseErrorMessage, + errorMessage, + errorCode, +} ) => { + let displayErrorMessage = errorMessage ? `${ errorMessage } (${ errorCode }).` : baseErrorMessage; + displayErrorMessage += ' ' + __( 'Try again in a few minutes.', 'jetpack-protect' ); + + return ( + + + ++++ { __( 'An error occurred', 'jetpack-protect' ) } + + +{ displayErrorMessage } +++ + } + secondary={ ++ ++ } + preserveSecondaryOnMobile={ false } + /> + ); +}; + +export default ErrorAdminSectionHero; diff --git a/projects/plugins/protect/src/js/components/error-admin-section-hero/styles.module.scss b/projects/plugins/protect/src/js/components/error-admin-section-hero/styles.module.scss new file mode 100644 index 0000000000000..3ab653757619a --- /dev/null +++ b/projects/plugins/protect/src/js/components/error-admin-section-hero/styles.module.scss @@ -0,0 +1,27 @@ +.heading { + display: flex; + align-items: center; +} + +.warning { + width: 54px; + height: 54px; + fill: var( --jp-red ); + margin-left: -8px; + margin-right: var( --spacing-base ); // 8px +} + +.illustration { + display: flex; + align-items: center; + height: 100%; + img { + // let's fit images + object-fit: cover; + width: 100%; + } +} + +.scan-navigation { + margin-top: calc( var( --spacing-base ) * 3 ); // 24px +} \ No newline at end of file diff --git a/projects/plugins/protect/src/js/components/error-section/index.tsx b/projects/plugins/protect/src/js/components/error-section/index.tsx deleted file mode 100644 index b94c0e80a17db..0000000000000 --- a/projects/plugins/protect/src/js/components/error-section/index.tsx +++ /dev/null @@ -1,49 +0,0 @@ -import { H3, Text } from '@automattic/jetpack-components'; -import { __ } from '@wordpress/i18n'; -import React from 'react'; -import inProgressImage from '../../../../assets/images/in-progress.png'; -import AlertSVGIcon from '../alert-icon'; -import SeventyFiveLayout from '../seventy-five-layout'; -import styles from './styles.module.scss'; - -type ErrorScreenProps = { - baseErrorMessage: string; - errorMessage: string; - errorCode: string; -}; - -/** - * Protect Logo component - * - * @param {object} props - Component props - * @param {string} props.baseErrorMessage - Base error message. - * @param {string} props.errorMessage - Error message. - * @param {string} props.errorCode - Error code. - * @return {React.ReactElement} Component template - */ -export default function ErrorScreen( { - baseErrorMessage = '', - errorMessage = '', - errorCode = '', -}: ErrorScreenProps ): React.ReactElement { - let displayErrorMessage = errorMessage ? `${ errorMessage } (${ errorCode }).` : baseErrorMessage; - displayErrorMessage += ' ' + __( 'Try again in a few minutes.', 'jetpack-protect' ); - - return ( -- - ); -} diff --git a/projects/plugins/protect/src/js/components/error-section/stories/index.stories.tsx b/projects/plugins/protect/src/js/components/error-section/stories/index.stories.tsx deleted file mode 100644 index aeb721ca7cf07..0000000000000 --- a/projects/plugins/protect/src/js/components/error-section/stories/index.stories.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react'; -import ErrorScreen from '..'; - -export default { - title: 'Plugins/Protect/ErrorScreen', - component: ErrorScreen, -}; - -const Template = args =>- { baseErrorMessage }
-{ displayErrorMessage } - - } - secondary={ --- } - preserveSecondaryOnMobile={ false } - >; - -export const _default = Template.bind( {} ); -_default.args = { - baseErrorMessage: 'An error occurred', - errorMessage: 'Error message', - errorCode: '500', -}; diff --git a/projects/plugins/protect/src/js/components/error-section/styles.module.scss b/projects/plugins/protect/src/js/components/error-section/styles.module.scss deleted file mode 100644 index 66f9763154bdc..0000000000000 --- a/projects/plugins/protect/src/js/components/error-section/styles.module.scss +++ /dev/null @@ -1,3 +0,0 @@ -.main-content { - padding: calc( var( --spacing-base ) * 7 ) 0; // 56px | 0px -} \ No newline at end of file diff --git a/projects/plugins/protect/src/js/components/firewall-footer/stories/broken/index.stories.jsx b/projects/plugins/protect/src/js/components/firewall-footer/stories/broken/index.stories.jsx deleted file mode 100644 index 89294777ff51d..0000000000000 --- a/projects/plugins/protect/src/js/components/firewall-footer/stories/broken/index.stories.jsx +++ /dev/null @@ -1,11 +0,0 @@ -import React from 'react'; -import FirewallFooter from '../index.jsx'; - -export default { - title: 'Plugins/Protect/Firewall Footer', - component: FirewallFooter, -}; - -export const Default = args => { - return ; -}; diff --git a/projects/plugins/protect/src/js/components/firewall-footer/styles.module.scss b/projects/plugins/protect/src/js/components/firewall-footer/styles.module.scss deleted file mode 100644 index 000cc085e7763..0000000000000 --- a/projects/plugins/protect/src/js/components/firewall-footer/styles.module.scss +++ /dev/null @@ -1,30 +0,0 @@ -.footer-checkbox { - display: flex; - align-items: center; - - & input[type=checkbox]:checked { - background: var( --jp-green-40 ); - border-color: var( --jp-green-40 ); - } - - & input[type=checkbox]:indeterminate { - background: var( --jp-green-40 ); - border-color: var( --jp-green-40 ); - } - - & input[type=checkbox]:focus { - box-shadow: 0 0 0 2px #fff, 0 0 0 4px var( --jp-green-40 ); - } -} - -.standalone-mode-section, .share-data-section { - margin-top: calc( var( --spacing-base ) * 7 ); // 56px - margin-bottom: calc( var( --spacing-base ) * 7 ); // 56px -} - -@media ( max-width: 599px ) { - - .share-data-section { - margin-top: 0; - } -} diff --git a/projects/plugins/protect/src/js/components/firewall-header/firewall-subheading.jsx b/projects/plugins/protect/src/js/components/firewall-header/firewall-subheading.jsx deleted file mode 100644 index 51cc0cefd9c01..0000000000000 --- a/projects/plugins/protect/src/js/components/firewall-header/firewall-subheading.jsx +++ /dev/null @@ -1,115 +0,0 @@ -import { Text, Button } from '@automattic/jetpack-components'; -import { __ } from '@wordpress/i18n'; -import { help } from '@wordpress/icons'; -import { useCallback } from 'react'; -import useAnalyticsTracks from '../../hooks/use-analytics-tracks'; -import usePlan from '../../hooks/use-plan'; -import useWafData from '../../hooks/use-waf-data'; -import IconTooltip from '../icon-tooltip'; -import styles from './styles.module.scss'; - -const UpgradePrompt = () => { - const { recordEvent } = useAnalyticsTracks(); - const { adminUrl } = window.jetpackProtectInitialState || {}; - const firewallUrl = adminUrl + '#/firewall'; - const { upgradePlan } = usePlan( { redirectUrl: firewallUrl } ); - - const { - config: { automaticRulesAvailable }, - } = useWafData(); - - const getScan = useCallback( () => { - recordEvent( 'jetpack_protect_waf_header_get_scan_link_click' ); - upgradePlan(); - }, [ recordEvent, upgradePlan ] ); - - return ( - - ); -}; - -const FirewallSubheadingContent = ( { className, text = '', popover = false } ) => { - return ( - -- ); -}; - -const FirewallSubheading = ( { - jetpackWafIpBlockListEnabled, - jetpackWafIpAllowListEnabled, - hasPlan, - automaticRulesAvailable, - jetpackWafAutomaticRules, - bruteForceProtectionIsEnabled, - wafSupported, -} ) => { - const allowOrBlockListEnabled = jetpackWafIpBlockListEnabled || jetpackWafIpAllowListEnabled; - const allRules = wafSupported && jetpackWafAutomaticRules && allowOrBlockListEnabled; - const automaticRules = wafSupported && jetpackWafAutomaticRules && ! allowOrBlockListEnabled; - const manualRules = wafSupported && ! jetpackWafAutomaticRules && allowOrBlockListEnabled; - const noRules = wafSupported && ! jetpackWafAutomaticRules && ! allowOrBlockListEnabled; - - return ( - <> -- { text } - - { popover && ( -- ) } - - { wafSupported && bruteForceProtectionIsEnabled && ( -- { ! hasPlan && wafSupported &&- ) } - { noRules && ( - - ) } - { automaticRules && ( - - ) } - { manualRules && ( - - ) } - { allRules && ( - - ) } - } - - ); -}; - -export default FirewallSubheading; diff --git a/projects/plugins/protect/src/js/components/firewall-header/index.jsx b/projects/plugins/protect/src/js/components/firewall-header/index.jsx deleted file mode 100644 index 09ee0eb92074a..0000000000000 --- a/projects/plugins/protect/src/js/components/firewall-header/index.jsx +++ /dev/null @@ -1,155 +0,0 @@ -import { AdminSectionHero, Container, Col, Text, H3, Status } from '@automattic/jetpack-components'; -import { Spinner } from '@wordpress/components'; -import { __ } from '@wordpress/i18n'; -import usePlan from '../../hooks/use-plan'; -import useWafData from '../../hooks/use-waf-data'; -import FirewallStatCards from './firewall-statcards'; -import FirewallSubheading from './firewall-subheading'; -import styles from './styles.module.scss'; - -const FirewallHeader = ( { - status, - hasPlan, - automaticRulesAvailable, - jetpackWafIpBlockListEnabled, - jetpackWafIpAllowListEnabled, - jetpackWafAutomaticRules, - bruteForceProtectionIsEnabled, - wafSupported, - currentDayStats, - thirtyDaysStats, - standaloneMode, -} ) => { - return ( - - - ); -}; - -const ConnectedFirewallHeader = () => { - const { - config: { - jetpackWafAutomaticRules, - jetpackWafIpBlockListEnabled, - jetpackWafIpAllowListEnabled, - standaloneMode, - automaticRulesAvailable, - bruteForceProtection, - }, - isToggling, - wafSupported, - stats, - isEnabled, - } = useWafData(); - const { hasPlan } = usePlan(); - const isSupportedWafFeatureEnabled = wafSupported ? isEnabled : bruteForceProtection; - const currentStatus = isSupportedWafFeatureEnabled ? 'on' : 'off'; - const { currentDay: currentDayBlockCount = 0, thirtyDays: thirtyDaysBlockCounts = 0 } = - stats?.blockedRequests || {}; - - return ( -- -- { 'on' === status && ( - <> - { ' ' } - - { ! wafSupported && __( 'Brute force protection is active', 'jetpack-protect' ) } - { wafSupported && - ( jetpackWafAutomaticRules - ? __( 'Automatic firewall is on', 'jetpack-protect' ) - : __( - 'Firewall is on', - 'jetpack-protect', - /* dummy arg to avoid bad minification */ 0 - ) ) } -
-- - ) } - { 'off' === status && ( - <> - - - { ! wafSupported && __( 'Brute force protection is disabled', 'jetpack-protect' ) } - { wafSupported && - ( automaticRulesAvailable - ? __( 'Automatic firewall is off', 'jetpack-protect' ) - : __( - 'Firewall is off', - 'jetpack-protect', - /* dummy arg to avoid bad minification */ 0 - ) ) } -
-- - ) } - { 'loading' === status && ( - <> - - - { __( 'Automatic firewall is being set up', 'jetpack-protect' ) } -
-- { __( 'Please wait…', 'jetpack-protect' ) } - - - ) } - -- { wafSupported && ( - - ) } - - - ); -}; - -export { FirewallHeader }; - -export default ConnectedFirewallHeader; diff --git a/projects/plugins/protect/src/js/components/firewall-header/stories/broken/index.stories.jsx b/projects/plugins/protect/src/js/components/firewall-header/stories/broken/index.stories.jsx deleted file mode 100644 index 7012e9c02321c..0000000000000 --- a/projects/plugins/protect/src/js/components/firewall-header/stories/broken/index.stories.jsx +++ /dev/null @@ -1,93 +0,0 @@ -import React from 'react'; -import { FirewallHeader } from '../../index.jsx'; - -export default { - title: 'Plugins/Protect/Firewall Header', - component: FirewallHeader, -}; - -const Template = args => ; - -export const FirewallOnFree = Template.bind( {} ); -FirewallOnFree.args = { - status: 'on', - hasPlan: false, - automaticRulesAvailable: false, - jetpackWafIpList: true, - jetpackWafAutomaticRules: false, - bruteForceProtectionIsEnabled: true, - wafSupported: true, - currentDayStats: 0, - thirtyDaysStats: 0, - standaloneMode: false, -}; - -export const FirewallOffFree = Template.bind( {} ); -FirewallOffFree.args = { - status: 'off', - hasPlan: false, - automaticRulesAvailable: false, - jetpackWafIpList: false, - jetpackWafAutomaticRules: false, - bruteForceProtectionIsEnabled: false, - wafSupported: true, - currentDayStats: 0, - thirtyDaysStats: 0, - standaloneMode: false, -}; - -export const FirewallOnPaid = Template.bind( {} ); -FirewallOnPaid.args = { - status: 'on', - hasPlan: true, - automaticRulesAvailable: true, - jetpackWafIpList: true, - jetpackWafAutomaticRules: true, - bruteForceProtectionIsEnabled: true, - wafSupported: true, - currentDayStats: 100, - thirtyDaysStats: 30000, - standaloneMode: false, -}; - -export const FirewallOffPaid = Template.bind( {} ); -FirewallOffPaid.args = { - status: 'off', - hasPlan: true, - automaticRulesAvailable: true, - jetpackWafIpList: false, - jetpackWafAutomaticRules: false, - bruteForceProtectionIsEnabled: false, - wafSupported: true, - currentDayStats: 0, - thirtyDaysStats: 0, - standaloneMode: false, -}; - -export const FirewallOnStandalone = Template.bind( {} ); -FirewallOnStandalone.args = { - status: 'on', - hasPlan: true, - automaticRulesAvailable: true, - jetpackWafIpList: true, - jetpackWafAutomaticRules: true, - bruteForceProtectionIsEnabled: true, - wafSupported: true, - currentDayStats: 100, - thirtyDaysStats: 30000, - standaloneMode: true, -}; - -export const FirewallLoading = Template.bind( {} ); -FirewallLoading.args = { - status: 'loading', - hasPlan: true, - automaticRulesAvailable: true, - jetpackWafIpList: false, - jetpackWafAutomaticRules: false, - bruteForceProtectionIsEnabled: false, - wafSupported: true, - currentDayStats: 0, - thirtyDaysStats: 0, - standaloneMode: false, -}; diff --git a/projects/plugins/protect/src/js/components/firewall-header/styles.module.scss b/projects/plugins/protect/src/js/components/firewall-header/styles.module.scss deleted file mode 100644 index ef16a23602243..0000000000000 --- a/projects/plugins/protect/src/js/components/firewall-header/styles.module.scss +++ /dev/null @@ -1,96 +0,0 @@ -svg.spinner { - width: 32px; - height: 32px; - margin: 0; - color: var( --jp-black ); -} - -.popover-text { - width: 250px; - padding: calc( var( --spacing-base ) * 2 ); // 16px -} - -.loading-text { - font-size: 18px; -} - -.firewall-header { - display: flex; - flex-wrap: wrap; - justify-content: space-between; - align-items: center; -} - -.firewall-subheading { - display: flex; - justify-content: flex-start; - flex-wrap: wrap; - align-items: center; - - .brute-force-protection-subheading { - margin-right: calc( var( --spacing-base ) / 2 ); // 4px - } - - &__content { - display: flex; - } -} - -.upgrade-button { - margin-top: calc( var( --spacing-base ) * 4 ); // 32px -} - -.stat-card-wrapper { - display: flex; - margin-left: auto; - flex-wrap: wrap; - - >:first-child { - margin-right: calc( var( --spacing-base ) * 3 ); // 24px - } - - .disabled { - opacity: 0.5; - } -} - -.stat-card-icon { - width: 100%; - margin-bottom: calc( var( --spacing-base ) * 3 ); // 24px - display: flex; - justify-content: space-between; - align-items: center; -} - -.stat-card-label { - white-space: nowrap; -} - -@media ( max-width: 1115px ) { - .firewall-header { - display: inline-block; - } - - .stat-card-wrapper { - margin-top: calc( var( --spacing-base ) * 3 ); // 24px - } -} - -@media ( max-width: 599px ) { - .firewall-heading { - width: 90%; - } - - .stat-card-wrapper { - margin-top: calc( var( --spacing-base ) * 3 ); // 24px - - >:first-child { - margin-right: 0; - margin-bottom: var( --spacing-base ); // 8px - } - } - - .stat-card-icon { - margin-bottom: 0; - } -} diff --git a/projects/plugins/protect/src/js/components/ignore-threat-modal/index.jsx b/projects/plugins/protect/src/js/components/ignore-threat-modal/index.jsx index 67d5f9894d9a2..7e8113b6f38ab 100644 --- a/projects/plugins/protect/src/js/components/ignore-threat-modal/index.jsx +++ b/projects/plugins/protect/src/js/components/ignore-threat-modal/index.jsx @@ -1,10 +1,9 @@ -import { Button, getRedirectUrl, Text } from '@automattic/jetpack-components'; +import { Button, getRedirectUrl, Text, ThreatSeverityBadge } from '@automattic/jetpack-components'; import { createInterpolateElement, useState } from '@wordpress/element'; import { __ } from '@wordpress/i18n'; import { Icon } from '@wordpress/icons'; import useIgnoreThreatMutation from '../../data/scan/use-ignore-threat-mutation'; import useModal from '../../hooks/use-modal'; -import ThreatSeverityBadge from '../severity'; import UserConnectionGate from '../user-connection-gate'; import styles from './styles.module.scss'; diff --git a/projects/plugins/protect/src/js/components/logo/index.tsx b/projects/plugins/protect/src/js/components/logo/index.tsx deleted file mode 100644 index 3e02acf06aa5b..0000000000000 --- a/projects/plugins/protect/src/js/components/logo/index.tsx +++ /dev/null @@ -1,96 +0,0 @@ -import { Path, SVG } from '@wordpress/components'; -import React from 'react'; - -type HEXColorType = `#${ string }`; - -type LogoProps = { - iconColor: HEXColorType; - color: HEXColorType; -}; - -/** - * Protect Logo component - * - * @param {object} props - Component props - * @param {HEXColorType} props.color - Text color. - * @param {HEXColorType} props.iconColor - Icon color - * @return {React.ReactElement} Component template - */ -export default function Logo( { - iconColor = '#069E08', - color = '#000', -}: LogoProps ): React.ReactElement { - return ( - - ); -} diff --git a/projects/plugins/protect/src/js/components/logo/stories/index.stories.tsx b/projects/plugins/protect/src/js/components/logo/stories/index.stories.tsx deleted file mode 100644 index 164640e03eaec..0000000000000 --- a/projects/plugins/protect/src/js/components/logo/stories/index.stories.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import React from 'react'; -import Logo from '..'; - -export default { - title: 'Plugins/Protect/Logo', - component: Logo, - argTypes: { - iconColor: { - control: { - type: 'color', - }, - }, - color: { - control: { - type: 'color', - }, - }, - }, -}; - -const Template = args => ; - -export const _default = Template.bind( {} ); -_default.args = { - iconColor: '#069E08', - color: '#000', -}; diff --git a/projects/plugins/protect/src/js/components/navigation/badge.jsx b/projects/plugins/protect/src/js/components/navigation/badge.jsx index 2552e5a719940..93ebecf7235ef 100644 --- a/projects/plugins/protect/src/js/components/navigation/badge.jsx +++ b/projects/plugins/protect/src/js/components/navigation/badge.jsx @@ -1,9 +1,10 @@ import { Text } from '@automattic/jetpack-components'; -import { Popover } from '@wordpress/components'; +import { Popover, Spinner } from '@wordpress/components'; import { __ } from '@wordpress/i18n'; import { Icon, check, info } from '@wordpress/icons'; import PropTypes from 'prop-types'; -import React, { useState, useCallback } from 'react'; +import React, { useState, useCallback, useMemo } from 'react'; +import useScanStatusQuery, { isScanInProgress } from '../../data/scan/use-scan-status-query'; import styles from './styles.module.scss'; /** @@ -50,12 +51,20 @@ const getBadgeElement = ( count, checked ) => { }; const ItemBadge = ( { count, checked } ) => { + const { data: status } = useScanStatusQuery(); + const { popoverText, badgeElement } = getBadgeElement( count, checked ); const [ showPopover, setShowPopover ] = useState( false ); + const inProgress = useMemo( () => isScanInProgress( status ), [ status ] ); + const handleEnter = useCallback( () => { + if ( inProgress ) { + return; + } + setShowPopover( true ); - }, [] ); + }, [ inProgress ] ); const handleOut = useCallback( () => { setShowPopover( false ); @@ -70,7 +79,7 @@ const ItemBadge = ( { count, checked } ) => { onBlur={ popoverText ? handleOut : null } role="presentation" > - { badgeElement } + { ! inProgress ? badgeElement : } { showPopover && ( diff --git a/projects/plugins/protect/src/js/components/navigation/stories/index.stories.jsx b/projects/plugins/protect/src/js/components/navigation/stories/index.stories.jsx deleted file mode 100644 index 8b9d7765da4fb..0000000000000 --- a/projects/plugins/protect/src/js/components/navigation/stories/index.stories.jsx +++ /dev/null @@ -1,64 +0,0 @@ -import { __ } from '@wordpress/i18n'; -import { wordpress, plugins, warning, color } from '@wordpress/icons'; -import React, { useState } from 'react'; -import Navigation, { NavigationItem, NavigationGroup } from '..'; - -export default { - title: 'Plugins/Protect/Navigation', - component: Navigation, - parameters: { - layout: 'centered', - }, - decorators: [ - Story => ( - @@ -578,7 +580,7 @@ const FirewallPage = () => { */ return (-- ), - ], -}; - -export const Default = args => { - const [ selected, setSelectedItem ] = useState( args.selected ); - - return ( -- - - ); -}; -Default.args = { - selected: 'all', -}; diff --git a/projects/plugins/protect/src/js/components/navigation/styles.module.scss b/projects/plugins/protect/src/js/components/navigation/styles.module.scss index c533ae1429600..df9e3ef1f8a25 100644 --- a/projects/plugins/protect/src/js/components/navigation/styles.module.scss +++ b/projects/plugins/protect/src/js/components/navigation/styles.module.scss @@ -1,6 +1,5 @@ .navigation { background-color: var( --jp-white ); - padding: var( --spacing-base ) 0; // 8px box-shadow: 0px 0px 40px rgba(0, 0, 0, 0.08); border-radius: var( --jp-border-radius ); margin: 0; diff --git a/projects/plugins/protect/src/js/components/paid-accordion/index.jsx b/projects/plugins/protect/src/js/components/paid-accordion/index.jsx index e1c612f339afc..d4a6fa5d3f0ba 100644 --- a/projects/plugins/protect/src/js/components/paid-accordion/index.jsx +++ b/projects/plugins/protect/src/js/components/paid-accordion/index.jsx @@ -1,4 +1,9 @@ -import { Spinner, Text, useBreakpointMatch } from '@automattic/jetpack-components'; +import { + Spinner, + Text, + ThreatSeverityBadge, + useBreakpointMatch, +} from '@automattic/jetpack-components'; import { ExternalLink } from '@wordpress/components'; import { dateI18n } from '@wordpress/date'; import { createInterpolateElement } from '@wordpress/element'; @@ -9,7 +14,6 @@ import React, { useState, useCallback, useContext, useMemo } from 'react'; import { PAID_PLUGIN_SUPPORT_URL } from '../../constants'; import useFixers from '../../hooks/use-fixers'; import IconTooltip from '../icon-tooltip'; -import ThreatSeverityBadge from '../severity'; import styles from './styles.module.scss'; // Extract context provider for clarity and reusability diff --git a/projects/plugins/protect/src/js/components/progress-bar/index.jsx b/projects/plugins/protect/src/js/components/progress-bar/index.jsx index 056da369be6eb..5a7393905b885 100644 --- a/projects/plugins/protect/src/js/components/progress-bar/index.jsx +++ b/projects/plugins/protect/src/js/components/progress-bar/index.jsx @@ -10,11 +10,7 @@ import styles from './style.module.scss'; * @param {number} props.value - Progress integer * @return {object} ProgressBar React component. */ -const ProgressBar = ( { className, total = 100, value } ) => { - if ( value == null ) { - return null; - } - +const ProgressBar = ( { className, total = 100, value = 0 } ) => { // The percentage should not be allowed to be more than 100 const progress = Math.min( Math.round( ( value / total ) * 100 ), 100 ); diff --git a/projects/plugins/protect/src/js/components/progress-bar/style.module.scss b/projects/plugins/protect/src/js/components/progress-bar/style.module.scss index c26fc6001cba6..a21649a8c3e83 100644 --- a/projects/plugins/protect/src/js/components/progress-bar/style.module.scss +++ b/projects/plugins/protect/src/js/components/progress-bar/style.module.scss @@ -2,7 +2,7 @@ display: flex; justify-content: space-between; align-items: center; - margin-bottom: calc( var( --spacing-base ) * 3 ); // 24px + margin-bottom: calc( var( --spacing-base ) * 2 ); // 16px &__wrapper { width: 100%; diff --git a/projects/plugins/protect/src/js/components/scan-button/index.jsx b/projects/plugins/protect/src/js/components/scan-button/index.jsx index 4844d9e4c060c..9df71f5984cf1 100644 --- a/projects/plugins/protect/src/js/components/scan-button/index.jsx +++ b/projects/plugins/protect/src/js/components/scan-button/index.jsx @@ -1,10 +1,16 @@ import { Button } from '@automattic/jetpack-components'; import { __ } from '@wordpress/i18n'; -import React, { forwardRef } from 'react'; +import React, { forwardRef, useMemo } from 'react'; +import useScanStatusQuery, { isScanInProgress } from '../../data/scan/use-scan-status-query'; import useStartScanMutator from '../../data/scan/use-start-scan-mutation'; const ScanButton = forwardRef( ( { variant = 'secondary', children, ...props }, ref ) => { const startScanMutation = useStartScanMutator(); + const { data: status } = useScanStatusQuery(); + + const disabled = useMemo( () => { + return startScanMutation.isPending || isScanInProgress( status ); + }, [ startScanMutation.isPending, status ] ); const handleScanClick = () => { return event => { @@ -14,7 +20,13 @@ const ScanButton = forwardRef( ( { variant = 'secondary', children, ...props }, }; return ( - -- - - -- - - -- - + { ! scanning && ( + + ) } + + { ! scanning && ( + + ) } ) } - -) } @@ -164,11 +171,13 @@ const ThreatsList = () => {- - - + { ! scanning && ( + + ) } ) : ( diff --git a/projects/plugins/protect/src/js/components/threats-list/paid-list.jsx b/projects/plugins/protect/src/js/components/threats-list/paid-list.jsx index e40178266cd08..baedf8dfa5184 100644 --- a/projects/plugins/protect/src/js/components/threats-list/paid-list.jsx +++ b/projects/plugins/protect/src/js/components/threats-list/paid-list.jsx @@ -1,11 +1,15 @@ -import { Text, Button, useBreakpointMatch } from '@automattic/jetpack-components'; +import { + Text, + Button, + DiffViewer, + MarkedLines, + useBreakpointMatch, +} from '@automattic/jetpack-components'; import { __, sprintf } from '@wordpress/i18n'; import React, { useCallback } from 'react'; import useAnalyticsTracks from '../../hooks/use-analytics-tracks'; import useFixers from '../../hooks/use-fixers'; import useModal from '../../hooks/use-modal'; -import DiffViewer from '../diff-viewer'; -import MarkedLines from '../marked-lines'; import PaidAccordion, { PaidAccordionItem } from '../paid-accordion'; import Pagination from './pagination'; import styles from './styles.module.scss'; diff --git a/projects/plugins/protect/src/js/components/unignore-threat-modal/index.jsx b/projects/plugins/protect/src/js/components/unignore-threat-modal/index.jsx index 9f3e73256d5bc..81f1eabb27d5b 100644 --- a/projects/plugins/protect/src/js/components/unignore-threat-modal/index.jsx +++ b/projects/plugins/protect/src/js/components/unignore-threat-modal/index.jsx @@ -1,10 +1,9 @@ -import { Button, Text } from '@automattic/jetpack-components'; +import { Button, Text, ThreatSeverityBadge } from '@automattic/jetpack-components'; import { __ } from '@wordpress/i18n'; import { Icon } from '@wordpress/icons'; import { useState } from 'react'; import useUnIgnoreThreatMutation from '../../data/scan/use-unignore-threat-mutation'; import useModal from '../../hooks/use-modal'; -import ThreatSeverityBadge from '../severity'; import UserConnectionGate from '../user-connection-gate'; import styles from './styles.module.scss'; diff --git a/projects/plugins/protect/src/js/data/scan/use-history-query.ts b/projects/plugins/protect/src/js/data/scan/use-history-query.ts index c5145e5c30768..5c728f60fe057 100644 --- a/projects/plugins/protect/src/js/data/scan/use-history-query.ts +++ b/projects/plugins/protect/src/js/data/scan/use-history-query.ts @@ -3,13 +3,14 @@ import { useQuery, UseQueryResult } from '@tanstack/react-query'; import camelize from 'camelize'; import API from '../../api'; import { QUERY_HISTORY_KEY } from '../../constants'; +import { ScanStatus } from '../../types/scans'; /** * Use History Query * * @return {UseQueryResult} useQuery result. */ -export default function useHistoryQuery(): UseQueryResult { +export default function useHistoryQuery(): UseQueryResult< ScanStatus | false > { const { isRegistered } = useConnection( { autoTrigger: false, from: 'protect', diff --git a/projects/plugins/protect/src/js/data/use-credentials-query.ts b/projects/plugins/protect/src/js/data/use-credentials-query.ts index 431f5c9045751..a5d2ddc8cc703 100644 --- a/projects/plugins/protect/src/js/data/use-credentials-query.ts +++ b/projects/plugins/protect/src/js/data/use-credentials-query.ts @@ -6,14 +6,9 @@ import { QUERY_CREDENTIALS_KEY } from '../constants'; /** * Credentials Query Hook * - * @param {object} args - Args. - * @param {boolean} args.usePolling - Use polling. - * * @return {UseQueryResult} useQuery result. */ -export default function useCredentialsQuery( { - usePolling, -}: { usePolling?: boolean } = {} ): UseQueryResult< [ Record< string, unknown > ] > { +export default function useCredentialsQuery(): UseQueryResult< [ Record< string, unknown > ] > { const { isRegistered } = useConnection( { autoTrigger: false, from: 'protect', @@ -25,19 +20,6 @@ export default function useCredentialsQuery( { queryKey: [ QUERY_CREDENTIALS_KEY ], queryFn: API.checkCredentials, initialData: window?.jetpackProtectInitialState?.credentials, - refetchInterval: query => { - if ( ! usePolling ) { - return false; - } - if ( ! query.state.data ) { - return false; - } - if ( query.state.data?.length ) { - return false; - } - - return 5_000; - }, enabled: isRegistered, } ); } diff --git a/projects/plugins/protect/src/js/hooks/use-protect-data/index.js b/projects/plugins/protect/src/js/hooks/use-protect-data/index.ts similarity index 88% rename from projects/plugins/protect/src/js/hooks/use-protect-data/index.js rename to projects/plugins/protect/src/js/hooks/use-protect-data/index.ts index 91daaf6a468e6..d560cff20ef86 100644 --- a/projects/plugins/protect/src/js/hooks/use-protect-data/index.js +++ b/projects/plugins/protect/src/js/hooks/use-protect-data/index.ts @@ -3,6 +3,12 @@ import { useMemo } from 'react'; import useHistoryQuery from '../../data/scan/use-history-query'; import useScanStatusQuery from '../../data/scan/use-scan-status-query'; import useProductDataQuery from '../../data/use-product-data-query'; +import { ExtensionStatus } from '../../types/scans'; +import { Threat, ThreatStatus } from '../../types/threats'; + +type ThreatFilterKey = 'all' | 'core' | 'files' | 'database' | string; + +type Filter = { key: ThreatFilterKey; status: ThreatStatus | 'all' }; // Valid "key" values for filtering. const KEY_FILTERS = [ 'all', 'core', 'plugins', 'themes', 'files', 'database' ]; @@ -12,13 +18,13 @@ const KEY_FILTERS = [ 'all', 'core', 'plugins', 'themes', 'files', 'database' ]; * * @param {Array} threats - The threats to filter. * @param {object} filter - The filter to apply to the data. - * @param {string} filter.status - The status to filter: 'all', 'fixed', or 'ignored'. + * @param {string} filter.status - The status to filter: 'all', 'current', 'fixed', or 'ignored'. * @param {string} filter.key - The key to filter: 'all', 'core', 'files', 'database', or an extension name. * @param {string} key - The threat's key: 'all', 'core', 'files', 'database', or an extension name. * * @return {Array} The filtered threats. */ -const filterThreats = ( threats, filter, key ) => { +const filterThreats = ( threats: Threat[], filter: Filter, key: ThreatFilterKey ): Threat[] => { if ( ! Array.isArray( threats ) ) { return []; } @@ -92,7 +98,7 @@ export default function useProtectData( }; // Loop through the provided extensions, and update the result object. - const processExtensions = ( extensions, key ) => { + const processExtensions = ( extensions: Array< ExtensionStatus >, key: ThreatFilterKey ) => { if ( ! Array.isArray( extensions ) ) { return []; } @@ -103,7 +109,7 @@ export default function useProtectData( // Filter the extension's threats based on the current filters. const filteredThreats = filterThreats( - extension?.threats, + extension?.threats || [], filter, KEY_FILTERS.includes( filter.key ) ? key : extension?.name ); @@ -118,7 +124,7 @@ export default function useProtectData( }; // Loop through the provided threats, and update the result object. - const processThreats = ( threatsToProcess, key ) => { + const processThreats = ( threatsToProcess: Threat[], key: ThreatFilterKey ) => { if ( ! Array.isArray( threatsToProcess ) ) { return []; } @@ -135,7 +141,7 @@ export default function useProtectData( // Core data may be either a single object or an array of multiple objects. let cores = Array.isArray( data.core ) ? data.core : []; - if ( data.core.threats ) { + if ( data?.core?.threats ) { cores = [ data.core ]; } diff --git a/projects/plugins/protect/src/js/routes/firewall/firewall-admin-section-hero.tsx b/projects/plugins/protect/src/js/routes/firewall/firewall-admin-section-hero.tsx new file mode 100644 index 0000000000000..3f70a75509b76 --- /dev/null +++ b/projects/plugins/protect/src/js/routes/firewall/firewall-admin-section-hero.tsx @@ -0,0 +1,100 @@ +import { Status, Text } from '@automattic/jetpack-components'; +import { __ } from '@wordpress/i18n'; +import { useMemo } from 'react'; +import AdminSectionHero from '../../components/admin-section-hero'; +import useWafData from '../../hooks/use-waf-data'; +import FirewallStatCards from './firewall-statcards'; +import FirewallSubheading from './firewall-subheading'; + +const FirewallAdminSectionHero = () => { + const { + config: { + jetpackWafAutomaticRules, + automaticRulesAvailable, + standaloneMode, + bruteForceProtection: isBruteForceModuleEnabled, + }, + isEnabled: isWafModuleEnabled, + wafSupported, + isToggling, + } = useWafData(); + + const isSupportedWafFeatureEnabled = wafSupported + ? isWafModuleEnabled + : isBruteForceModuleEnabled; + const currentStatus = isSupportedWafFeatureEnabled ? 'on' : 'off'; + const status = isToggling ? 'loading' : currentStatus; + + const statusLabel = useMemo( () => { + if ( status === 'on' ) { + return standaloneMode + ? __( 'Standalone mode', 'jetpack-protect' ) + : __( 'Active', 'jetpack-protect', 0 ); + } + + return __( 'Inactive', 'jetpack-protect' ); + }, [ status, standaloneMode ] ); + + const heading = useMemo( () => { + if ( status === 'on' ) { + return ( + <> + { ! wafSupported && __( 'Brute force protection is active', 'jetpack-protect' ) } + { wafSupported && + ( jetpackWafAutomaticRules + ? __( 'Automatic firewall is on', 'jetpack-protect' ) + : __( + 'Firewall is on', + 'jetpack-protect', + /* dummy arg to avoid bad minification */ 0 + ) ) } + + ); + } + + if ( status === 'off' ) { + return ( + <> + { ! wafSupported && __( 'Brute force protection is disabled', 'jetpack-protect' ) } + { wafSupported && + ( automaticRulesAvailable + ? __( 'Automatic firewall is off', 'jetpack-protect' ) + : __( + 'Firewall is off', + 'jetpack-protect', + /* dummy arg to avoid bad minification */ 0 + ) ) } + + ); + } + + if ( status === 'loading' ) { + return __( 'Automatic firewall is being set up', 'jetpack-protect' ); + } + + return null; + }, [ status, wafSupported, jetpackWafAutomaticRules, automaticRulesAvailable ] ); + + const subheading = useMemo( () => { + if ( status === 'loading' ) { + return { __( 'Please wait…', 'jetpack-protect' ) } ; + } + + return; + }, [ status ] ); + + return ( + + + { heading } +{ subheading } + + } + secondary={ wafSupported &&} + /> + ); +}; + +export default FirewallAdminSectionHero; diff --git a/projects/plugins/protect/src/js/components/firewall-footer/index.jsx b/projects/plugins/protect/src/js/routes/firewall/firewall-footer.jsx similarity index 98% rename from projects/plugins/protect/src/js/components/firewall-footer/index.jsx rename to projects/plugins/protect/src/js/routes/firewall/firewall-footer.jsx index 2439e67bc2f9a..abc7b0cf02c13 100644 --- a/projects/plugins/protect/src/js/components/firewall-footer/index.jsx +++ b/projects/plugins/protect/src/js/routes/firewall/firewall-footer.jsx @@ -2,10 +2,10 @@ import { AdminSectionHero, Title, Text, Button } from '@automattic/jetpack-compo import { CheckboxControl } from '@wordpress/components'; import { __ } from '@wordpress/i18n'; import { useState, useEffect, useCallback } from 'react'; +import SeventyFiveLayout from '../../components/seventy-five-layout'; import useModal from '../../hooks/use-modal'; import useNotices from '../../hooks/use-notices'; import useWafData from '../../hooks/use-waf-data'; -import SeventyFiveLayout from '../seventy-five-layout'; import styles from './styles.module.scss'; const StandaloneMode = () => { diff --git a/projects/plugins/protect/src/js/components/firewall-header/firewall-statcards.jsx b/projects/plugins/protect/src/js/routes/firewall/firewall-statcards.jsx similarity index 53% rename from projects/plugins/protect/src/js/components/firewall-header/firewall-statcards.jsx rename to projects/plugins/protect/src/js/routes/firewall/firewall-statcards.jsx index b5ff8c38851d9..15c80df763c18 100644 --- a/projects/plugins/protect/src/js/components/firewall-header/firewall-statcards.jsx +++ b/projects/plugins/protect/src/js/routes/firewall/firewall-statcards.jsx @@ -2,33 +2,50 @@ import { Text, useBreakpointMatch, StatCard } from '@automattic/jetpack-componen import { __, sprintf } from '@wordpress/i18n'; import { Icon, shield, chartBar } from '@wordpress/icons'; import { useCallback, useMemo } from 'react'; +import usePlan from '../../hooks/use-plan'; +import useWafData from '../../hooks/use-waf-data'; import styles from './styles.module.scss'; -const FirewallStatCards = ( { status, hasPlan, currentDayStats, thirtyDaysStats } ) => { +const FirewallStatCards = () => { + const { hasPlan } = usePlan(); + const { + config: { bruteForceProtection: isBruteForceModuleEnabled }, + isEnabled: isWafModuleEnabled, + wafSupported, + stats, + } = useWafData(); const [ isSmall ] = useBreakpointMatch( [ 'sm', 'lg' ], [ null, '<' ] ); + const isSupportedWafFeatureEnabled = wafSupported + ? isWafModuleEnabled + : isBruteForceModuleEnabled; + const { currentDay: currentDayBlockCount, thirtyDays: thirtyDayBlockCounts } = stats + ? stats.blockedRequests + : { currentDay: 0, thirtyDays: 0 }; + const isFeatureDisabled = ! isSupportedWafFeatureEnabled || ! hasPlan; + const defaultArgs = useMemo( () => ( { - className: status !== 'on' || ! hasPlan ? styles.disabled : styles.active, + className: isFeatureDisabled ? styles.disabled : styles.active, variant: isSmall ? 'horizontal' : 'square', } ), - [ status, isSmall, hasPlan ] + [ isFeatureDisabled, isSmall ] ); - const getIcon = useCallback( - icon => ( + const StatCardIcon = useCallback( + ( { icon } ) => ( { ! isSmall && ! hasPlan && ( - { __( 'Paid feature', 'jetpack-protect' ) } +{ __( 'Paid feature', 'jetpack-protect' ) } ) } ), [ isSmall, hasPlan ] ); - const getLabel = useCallback( - ( period, units ) => + const StatCardLabel = useCallback( + ( { period, units } ) => isSmall ? ( { sprintf( @@ -58,21 +75,21 @@ const FirewallStatCards = ( { status, hasPlan, currentDayStats, thirtyDaysStats const currentDayArgs = useMemo( () => ( { ...defaultArgs, - icon: getIcon( shield ), - label: getLabel( 24, 'hours' ), - value: status !== 'on' || ! hasPlan ? 0 : currentDayStats, + icon:, + label: , + value: isFeatureDisabled ? 0 : currentDayBlockCount, } ), - [ defaultArgs, getIcon, getLabel, status, hasPlan, currentDayStats ] + [ defaultArgs, StatCardIcon, StatCardLabel, isFeatureDisabled, currentDayBlockCount ] ); const thirtyDaysArgs = useMemo( () => ( { ...defaultArgs, - icon: getIcon( chartBar ), - label: getLabel( 30, 'days' ), - value: status !== 'on' || ! hasPlan ? 0 : thirtyDaysStats, + icon: , + label: , + value: isFeatureDisabled ? 0 : thirtyDayBlockCounts, } ), - [ defaultArgs, getIcon, getLabel, status, hasPlan, thirtyDaysStats ] + [ defaultArgs, StatCardIcon, StatCardLabel, isFeatureDisabled, thirtyDayBlockCounts ] ); return ( diff --git a/projects/plugins/protect/src/js/routes/firewall/firewall-subheading.jsx b/projects/plugins/protect/src/js/routes/firewall/firewall-subheading.jsx new file mode 100644 index 0000000000000..99418be593004 --- /dev/null +++ b/projects/plugins/protect/src/js/routes/firewall/firewall-subheading.jsx @@ -0,0 +1,93 @@ +import { Text } from '@automattic/jetpack-components'; +import { __ } from '@wordpress/i18n'; +import { help } from '@wordpress/icons'; +import { useMemo } from 'react'; +import IconTooltip from '../../components/icon-tooltip'; +import usePlan from '../../hooks/use-plan'; +import useWafData from '../../hooks/use-waf-data'; +import FirewallUpgradePrompt from './firewall-upgrade-prompt'; +import styles from './styles.module.scss'; + +const FirewallSubheading = () => { + const { hasPlan } = usePlan(); + const { + config: { + jetpackWafAutomaticRules, + jetpackWafIpBlockListEnabled, + jetpackWafIpAllowListEnabled, + automaticRulesAvailable, + bruteForceProtection: isBruteForceModuleEnabled, + }, + wafSupported, + } = useWafData(); + + const allowOrBlockListEnabled = jetpackWafIpBlockListEnabled || jetpackWafIpAllowListEnabled; + + const wafRules = useMemo( + () => ( { + allRules: wafSupported && jetpackWafAutomaticRules && allowOrBlockListEnabled, + automaticRules: wafSupported && jetpackWafAutomaticRules && ! allowOrBlockListEnabled, + manualRules: wafSupported && ! jetpackWafAutomaticRules && allowOrBlockListEnabled, + noRules: wafSupported && ! jetpackWafAutomaticRules && ! allowOrBlockListEnabled, + } ), + [ wafSupported, jetpackWafAutomaticRules, allowOrBlockListEnabled ] + ); + + const content = useMemo( () => { + const textSegments = []; + + if ( wafSupported && isBruteForceModuleEnabled ) { + textSegments.push( __( 'Brute force protection is active.', 'jetpack-protect' ) ); + } + + if ( wafRules.noRules ) { + textSegments.push( __( 'There are no firewall rules applied.', 'jetpack-protect' ) ); + } + + if ( wafRules.automaticRules ) { + textSegments.push( __( 'Automatic firewall rules apply.', 'jetpack-protect' ) ); + } + + if ( wafRules.manualRules ) { + textSegments.push( __( 'Only manual IP list rules apply.', 'jetpack-protect' ) ); + } + + if ( wafRules.allRules ) { + textSegments.push( __( 'All firewall rules apply.', 'jetpack-protect' ) ); + } + + return textSegments.join( ' ' ); + }, [ wafSupported, isBruteForceModuleEnabled, wafRules ] ); + + const tooltipText = useMemo( () => { + return ! automaticRulesAvailable + ? __( + 'The free version of the firewall only allows for use of manual rules.', + 'jetpack-protect' + ) + : __( + 'The free version of the firewall does not receive updates to automatic security rules.', + 'jetpack-protect', + /* dummy arg to avoid bad minification */ 0 + ); + }, [ automaticRulesAvailable ] ); + + const renderTooltip = () => { + if ( ! hasPlan && ( wafRules.automaticRules || wafRules.manualRules || wafRules.allRules ) ) { + return ; + } + return null; + }; + + return ( + <> + ++ { ! hasPlan && wafSupported &&{ content } + { renderTooltip() } +} + + ); +}; + +export default FirewallSubheading; diff --git a/projects/plugins/protect/src/js/routes/firewall/firewall-upgrade-prompt.jsx b/projects/plugins/protect/src/js/routes/firewall/firewall-upgrade-prompt.jsx new file mode 100644 index 0000000000000..7e6f15024a5c6 --- /dev/null +++ b/projects/plugins/protect/src/js/routes/firewall/firewall-upgrade-prompt.jsx @@ -0,0 +1,37 @@ +import { Button } from '@automattic/jetpack-components'; +import { __ } from '@wordpress/i18n'; +import { useCallback } from 'react'; +import useAnalyticsTracks from '../../hooks/use-analytics-tracks'; +import usePlan from '../../hooks/use-plan'; +import useWafData from '../../hooks/use-waf-data'; +import styles from './styles.module.scss'; + +const FirewallUpgradePrompt = () => { + const { recordEvent } = useAnalyticsTracks(); + const { adminUrl } = window.jetpackProtectInitialState || {}; + const firewallUrl = adminUrl + '#/firewall'; + const { upgradePlan } = usePlan( { redirectUrl: firewallUrl } ); + + const { + config: { automaticRulesAvailable }, + } = useWafData(); + + const getScan = useCallback( () => { + recordEvent( 'jetpack_protect_waf_header_get_scan_link_click' ); + upgradePlan(); + }, [ recordEvent, upgradePlan ] ); + + return ( + + ); +}; + +export default FirewallUpgradePrompt; diff --git a/projects/plugins/protect/src/js/routes/firewall/index.jsx b/projects/plugins/protect/src/js/routes/firewall/index.jsx index 966c72f2c6597..53af919b17f78 100644 --- a/projects/plugins/protect/src/js/routes/firewall/index.jsx +++ b/projects/plugins/protect/src/js/routes/firewall/index.jsx @@ -14,10 +14,7 @@ import { Icon, closeSmall } from '@wordpress/icons'; import moment from 'moment'; import { useCallback, useEffect, useState, useMemo } from 'react'; import AdminPage from '../../components/admin-page'; -import FirewallFooter from '../../components/firewall-footer'; -import ConnectedFirewallHeader from '../../components/firewall-header'; import FormToggle from '../../components/form-toggle'; -import ScanFooter from '../../components/scan-footer'; import Textarea from '../../components/textarea'; import { FREE_PLUGIN_SUPPORT_URL, PAID_PLUGIN_SUPPORT_URL } from '../../constants'; import useWafSeenMutation from '../../data/waf/use-waf-seen-mutation'; @@ -25,6 +22,9 @@ import useWafUpgradeSeenMutation from '../../data/waf/use-waf-upgrade-seen-mutat import useAnalyticsTracks from '../../hooks/use-analytics-tracks'; import usePlan from '../../hooks/use-plan'; import useWafData from '../../hooks/use-waf-data'; +import ScanFooter from '../scan/scan-footer'; +import FirewallAdminSectionHero from './firewall-admin-section-hero'; +import FirewallFooter from './firewall-footer'; import styles from './styles.module.scss'; const ADMIN_URL = window?.jetpackProtectInitialState?.adminUrl; @@ -48,7 +48,7 @@ const FirewallPage = () => { displayUpgradeBadge, wafSupported, isUpdating, - stats: { automaticRulesLastUpdated }, + stats, toggleAutomaticRules, toggleIpAllowList, saveIpAllowList, @@ -62,6 +62,8 @@ const FirewallPage = () => { const { recordEvent } = useAnalyticsTracks(); const wafSeenMutation = useWafSeenMutation(); const wafUpgradeSeenMutation = useWafUpgradeSeenMutation(); + const { automaticRulesLastUpdated } = stats; + /** * Automatic Rules Installation Error State * @@ -309,7 +311,7 @@ const FirewallPage = () => { mb={ 3 } > { __( - 'Turn on Jetpack Firewall to automatically protect your site with the latest security rules.', + 'Turn on Automatic firewall protection to apply the latest security rules.', 'jetpack-protect' ) } - ); diff --git a/projects/plugins/protect/src/js/routes/scan/history/styles.module.scss b/projects/plugins/protect/src/js/routes/scan/history/styles.module.scss index a574cecd736cb..f66602e59a9e9 100644 --- a/projects/plugins/protect/src/js/routes/scan/history/styles.module.scss +++ b/projects/plugins/protect/src/js/routes/scan/history/styles.module.scss @@ -1,32 +1,3 @@ -.summary { - > :first-child { - flex: 1; - } - - @media ( min-width: 960px ) { - display: flex; - align-items: flex-start; - } -} - -.summary__title { - display: flex; - align-items: center; - color: var( --jp-black ); -} - -.summary__icon { - margin-left: -4px; // this fix a blank space on right/left from @wordpress/icons - margin-right: var( --spacing-base ); // 8px -} - -.summary__actions { - display: flex; - flex-direction: column; - align-items: flex-end; - gap: calc( var( --spacing-base ) * 2 ); // 16px -} - .empty { display: flex; width: 100%; @@ -37,6 +8,10 @@ flex-direction: column; } +.subheading-content { + font-weight: bold; +} + .list-header { display: flex; justify-content: flex-end; @@ -64,3 +39,7 @@ display: none; } } + +.scan-navigation { + margin-top: calc( var( --spacing-base ) * 3 ); // 24px +} \ No newline at end of file diff --git a/projects/plugins/protect/src/js/routes/scan/index.jsx b/projects/plugins/protect/src/js/routes/scan/index.jsx index dfb1a3cf285bd..1f3cdfdd7520f 100644 --- a/projects/plugins/protect/src/js/routes/scan/index.jsx +++ b/projects/plugins/protect/src/js/routes/scan/index.jsx @@ -1,137 +1,14 @@ -import { AdminSectionHero, Container, Col, H3, Text } from '@automattic/jetpack-components'; -import { Spinner } from '@wordpress/components'; -import { __, sprintf } from '@wordpress/i18n'; -import { useMemo } from 'react'; -import inProgressImage from '../../../../assets/images/in-progress.png'; +import { AdminSection, Container, Col } from '@automattic/jetpack-components'; import AdminPage from '../../components/admin-page'; -import ErrorScreen from '../../components/error-section'; -import ProgressBar from '../../components/progress-bar'; -import ScanFooter from '../../components/scan-footer'; -import SeventyFiveLayout from '../../components/seventy-five-layout'; -import Summary from '../../components/summary'; import ThreatsList from '../../components/threats-list'; -import useScanStatusQuery, { isScanInProgress } from '../../data/scan/use-scan-status-query'; +import useScanStatusQuery from '../../data/scan/use-scan-status-query'; import useAnalyticsTracks from '../../hooks/use-analytics-tracks'; import { OnboardingContext } from '../../hooks/use-onboarding'; import usePlan from '../../hooks/use-plan'; import useProtectData from '../../hooks/use-protect-data'; -import useWafData from '../../hooks/use-waf-data'; import onboardingSteps from './onboarding-steps'; -import ScanSectionHeader from './scan-section-header'; -import ScanSectionNotices from './scan-section-notices'; -import styles from './styles.module.scss'; - -/** - * Error Section - * - * @param {object} props - Component props. - * @param {string} props.errorMessage - The error message. - * @param {string} props.errorCode - The error code. - * - * @return {Component} The component. - */ -const ErrorSection = ( { errorMessage, errorCode } ) => { - return ( - <> -+ { wafSupported && ! isWafModuleEnabled && + + ) }{ moduleDisabledNotice } } diff --git a/projects/plugins/protect/src/js/routes/firewall/styles.module.scss b/projects/plugins/protect/src/js/routes/firewall/styles.module.scss index 3cb38545babbd..950bb7d954159 100644 --- a/projects/plugins/protect/src/js/routes/firewall/styles.module.scss +++ b/projects/plugins/protect/src/js/routes/firewall/styles.module.scss @@ -64,24 +64,6 @@ } } -.manual-rules-stats { - display: flex; - flex-wrap: wrap; - - &__no-rules { - color: var( --jp-gray-50 ); - } - - &__block-list-count { - color: var( --jp-green-50 ); - margin-right: calc( var( --spacing-base ) / 2 ); // 4px - } - - &__allow-list-count { - color: var( --jp-green-50 ); - } -} - .upgrade-trigger-section { margin-top: calc( var( --spacing-base ) * 3 ); // 24px @@ -90,6 +72,10 @@ } } +.upgrade-prompt-button { + margin-top: calc( var( --spacing-base ) * 3 ); // 24px +} + .badge { color: var( --jp-gray-30 ); font-size: 12px; @@ -126,28 +112,6 @@ } } -.status { - color: var( --jp-gray-50 ); - - &:before { - content: ""; - display: inline-block; - border-radius: 50%; - height: 8px; - width: 8px; - margin-right: var(--spacing-base); // 8px - background: var( --jp-gray-50 ); - } - - &.active { - color: var( --jp-green-40 ); - - &:before { - background: var( --jp-green-40 ); - } - } -} - .allow-list-current-ip { line-height: 1; margin-bottom: calc( var( --spacing-base ) * 1.5 ); // 12px @@ -169,4 +133,91 @@ .divider { margin-top: calc( var( --spacing-base ) * 7 ); // 56px border-bottom: solid 2px var( --jp-gray-5 ); -} \ No newline at end of file +} + +.popover-text { + width: 250px; + padding: calc( var( --spacing-base ) * 2 ); // 16px +} + +.firewall-subheading { + display: flex; +} + +.stat-card-wrapper { + display: flex; + margin-left: auto; + flex-wrap: wrap; + + >:first-child { + margin-right: calc( var( --spacing-base ) * 3 ); // 24px + } + + .disabled { + opacity: 0.5; + } +} + +.stat-card-icon { + width: 100%; + margin-bottom: calc( var( --spacing-base ) * 3 ); // 24px + display: flex; + justify-content: space-between; + align-items: center; +} + +.stat-card-label { + white-space: nowrap; +} + +@media ( max-width: 1115px ) { + .stat-card-wrapper { + margin-top: calc( var( --spacing-base ) * 3 ); // 24px + } +} + +@media ( max-width: 599px ) { + .stat-card-wrapper { + margin-top: calc( var( --spacing-base ) * 3 ); // 24px + + >:first-child { + margin-right: 0; + margin-bottom: var( --spacing-base ); // 8px + } + } + + .stat-card-icon { + margin-bottom: 0; + } +} + +.footer-checkbox { + display: flex; + align-items: center; + + & input[type=checkbox]:checked { + background: var( --jp-green-40 ); + border-color: var( --jp-green-40 ); + } + + & input[type=checkbox]:indeterminate { + background: var( --jp-green-40 ); + border-color: var( --jp-green-40 ); + } + + & input[type=checkbox]:focus { + box-shadow: 0 0 0 2px #fff, 0 0 0 4px var( --jp-green-40 ); + } +} + +.standalone-mode-section, .share-data-section { + margin-top: calc( var( --spacing-base ) * 7 ); // 56px + margin-bottom: calc( var( --spacing-base ) * 7 ); // 56px +} + +@media ( max-width: 599px ) { + + .share-data-section { + margin-top: 0; + } +} diff --git a/projects/plugins/protect/src/js/routes/scan/history/history-admin-section-hero.tsx b/projects/plugins/protect/src/js/routes/scan/history/history-admin-section-hero.tsx new file mode 100644 index 0000000000000..9c8f30b7b8067 --- /dev/null +++ b/projects/plugins/protect/src/js/routes/scan/history/history-admin-section-hero.tsx @@ -0,0 +1,86 @@ +import { Status, Text } from '@automattic/jetpack-components'; +import { dateI18n } from '@wordpress/date'; +import { __, sprintf } from '@wordpress/i18n'; +import { useMemo } from 'react'; +import { useParams } from 'react-router-dom'; +import AdminSectionHero from '../../../components/admin-section-hero'; +import ErrorAdminSectionHero from '../../../components/error-admin-section-hero'; +import ScanNavigation from '../../../components/scan-navigation'; +import useThreatsList from '../../../components/threats-list/use-threats-list'; +import useProtectData from '../../../hooks/use-protect-data'; +import styles from './styles.module.scss'; + +const HistoryAdminSectionHero: React.FC = () => { + const { filter = 'all' } = useParams(); + const { list } = useThreatsList( { + source: 'history', + status: filter, + } ); + const { counts, error } = useProtectData( { + sourceType: 'history', + filter: { status: filter }, + } ); + const { threats: numAllThreats } = counts.all; + + const oldestFirstDetected = useMemo( () => { + if ( ! list.length ) { + return null; + } + + return list.reduce( ( oldest, current ) => { + return new Date( current.firstDetected ) < new Date( oldest.firstDetected ) + ? current + : oldest; + } ).firstDetected; + }, [ list ] ); + + if ( error ) { + return ( + + ); + } + + return ( + + + + { numAllThreats > 0 + ? sprintf( + /* translators: %s: Total number of threats */ + __( '%1$s previously active %2$s', 'jetpack-protect' ), + numAllThreats, + numAllThreats === 1 ? 'threat' : 'threats' + ) + : __( 'No previously active threats', 'jetpack-protect' ) } + ++ ++ { oldestFirstDetected ? ( + + { sprintf( + /* translators: %s: Oldest first detected date */ + __( '%s - Today', 'jetpack-protect' ), + dateI18n( 'F jS g:i A', oldestFirstDetected, false ) + ) } + + ) : ( + __( 'Most recent results', 'jetpack-protect' ) + ) } + +++ + } + /> + ); +}; + +export default HistoryAdminSectionHero; diff --git a/projects/plugins/protect/src/js/routes/scan/history/index.jsx b/projects/plugins/protect/src/js/routes/scan/history/index.jsx index 1c0014983d296..f65cb0633f251 100644 --- a/projects/plugins/protect/src/js/routes/scan/history/index.jsx +++ b/projects/plugins/protect/src/js/routes/scan/history/index.jsx @@ -1,18 +1,17 @@ -import { AdminSectionHero, Container, Col, H3, Text, Title } from '@automattic/jetpack-components'; +import { AdminSection, Container, Col, H3, Text, Title } from '@automattic/jetpack-components'; import { __, _n, sprintf } from '@wordpress/i18n'; import { useCallback } from 'react'; import { Navigate, useParams } from 'react-router-dom'; import AdminPage from '../../../components/admin-page'; -import ErrorScreen from '../../../components/error-section'; import ProtectCheck from '../../../components/protect-check-icon'; -import ScanFooter from '../../../components/scan-footer'; import ThreatsNavigation from '../../../components/threats-list/navigation'; import PaidList from '../../../components/threats-list/paid-list'; import useThreatsList from '../../../components/threats-list/use-threats-list'; import useAnalyticsTracks from '../../../hooks/use-analytics-tracks'; import usePlan from '../../../hooks/use-plan'; import useProtectData from '../../../hooks/use-protect-data'; -import ScanSectionHeader from '../scan-section-header'; +import ScanFooter from '../scan-footer'; +import HistoryAdminSectionHero from './history-admin-section-hero'; import StatusFilters from './status-filters'; import styles from './styles.module.scss'; @@ -241,35 +240,10 @@ const ScanHistoryRoute = () => { return (+ - - +- - - - { error ? ( - - - - ) : ( + + { ( ! error || numAllThreats ) && ( + + @@ -316,9 +290,9 @@ const ScanHistoryRoute = () => { - - - - - - - ); -}; - -/** - * Scan In Progress Section - * - * @param {object} props - Component props. - * @param {number} props.currentProgress - The current progress of the scan. - * - * @return {Component} The component. - */ -const ScanInProgressSection = ( { currentProgress } ) => { - const { hasPlan } = usePlan(); - const { globalStats } = useWafData(); - const totalVulnerabilities = parseInt( globalStats?.totalVulnerabilities ); - const totalVulnerabilitiesFormatted = isNaN( totalVulnerabilities ) - ? '50,000' - : totalVulnerabilities.toLocaleString(); - - return ( - <> - - - - - - - - - } - secondary={ -- - { __( 'Scanning your site…', 'jetpack-protect' ) } - - - - { __( 'Your results will be ready soon', 'jetpack-protect' ) } -
- { hasPlan &&} - - { sprintf( - // translators: placeholder is the number of total vulnerabilities i.e. "22,000". - __( - 'We are scanning for security threats from our more than %s listed vulnerabilities, powered by WPScan. This could take a minute or two.', - 'jetpack-protect' - ), - totalVulnerabilitiesFormatted - ) } - - --- } - preserveSecondaryOnMobile={ false } - fluid={ true } - /> - - - ); -}; - -/** - * Scan Results Section - * - * @return {Component} The component. - */ -const ScanResultsSection = () => { - return ( - <> -- - - - - - - ); -}; +import ScanAdminSectionHero from './scan-admin-section-hero'; +import ScanFooter from './scan-footer'; /** * Scan Page @@ -142,7 +19,12 @@ const ScanResultsSection = () => { */ const ScanPage = () => { const { hasPlan } = usePlan(); - const { lastChecked } = useProtectData(); + const { + counts: { + current: { threats: numThreats }, + }, + lastChecked, + } = useProtectData(); const { data: status } = useScanStatusQuery( { usePolling: true } ); let currentScanStatus; @@ -163,28 +45,19 @@ const ScanPage = () => { }, } ); - // Render the appropriate section based on the scan status. - const renderSection = useMemo( () => { - if ( isScanInProgress( status ) ) { - return ; - } - - if ( status.error ) { - return ; - } - - return ; - }, [ status ] ); - return ( - - +- - { renderSection } - -+ { ( ! status.error || numThreats ) && ( + + + ) }+ ++ + + ; + } + + if ( status.error ) { + return ( + + ); + } + + return ( + + + + { numThreats > 0 + ? sprintf( + /* translators: %s: Total number of threats/vulnerabilities */ + __( '%1$s %2$s found', 'jetpack-protect' ), + numThreats, + hasPlan + ? _n( 'threat', 'threats', numThreats, 'jetpack-protect' ) + : _n( 'vulnerability', 'vulnerabilities', numThreats, 'jetpack-protect' ) + ) + : sprintf( + /* translators: %s: Pluralized type of threat/vulnerability */ + __( 'No %s found', 'jetpack-protect' ), + hasPlan + ? __( 'threats', 'jetpack-protect' ) + : __( + 'vulnerabilities', + 'jetpack-protect', + /* dummy arg to avoid bad minification */ 0 + ) + ) } + ++ <> + ++ { lastCheckedLocalTimestamp ? ( + <> + + { dateI18n( 'F jS g:i A', lastCheckedLocalTimestamp, false ) } + + + { __( 'results', 'jetpack-protect' ) } + + ) : ( + __( 'Most recent results', 'jetpack-protect' ) + ) } + + { ! hasPlan && ( ++ ) } + + ++ + } + /> + ); +}; + +export default ScanAdminSectionHero; diff --git a/projects/plugins/protect/src/js/components/scan-footer/index.jsx b/projects/plugins/protect/src/js/routes/scan/scan-footer.jsx similarity index 98% rename from projects/plugins/protect/src/js/components/scan-footer/index.jsx rename to projects/plugins/protect/src/js/routes/scan/scan-footer.jsx index 2c44c97dd899c..56d7ea1c14a7d 100644 --- a/projects/plugins/protect/src/js/components/scan-footer/index.jsx +++ b/projects/plugins/protect/src/js/routes/scan/scan-footer.jsx @@ -9,10 +9,10 @@ import { } from '@automattic/jetpack-components'; import { __, sprintf } from '@wordpress/i18n'; import React, { useCallback } from 'react'; +import SeventyFiveLayout from '../../components/seventy-five-layout'; import useAnalyticsTracks from '../../hooks/use-analytics-tracks'; import usePlan from '../../hooks/use-plan'; import useWafData from '../../hooks/use-waf-data'; -import SeventyFiveLayout from '../seventy-five-layout'; import styles from './styles.module.scss'; const ProductPromotion = () => { diff --git a/projects/plugins/protect/src/js/routes/scan/scan-section-header.tsx b/projects/plugins/protect/src/js/routes/scan/scan-section-header.tsx deleted file mode 100644 index d1196f9bb051b..0000000000000 --- a/projects/plugins/protect/src/js/routes/scan/scan-section-header.tsx +++ /dev/null @@ -1,48 +0,0 @@ -import { Container, Col, Text, Title, getIconBySlug } from '@automattic/jetpack-components'; -import React from 'react'; -import usePlan from '../../hooks/use-plan'; -import ScanSectionNavigation from './scan-section-navigation'; -import styles from './styles.module.scss'; - -type Props = { - title?: string | React.ReactNode; - subtitle?: string | React.ReactNode; - controls?: React.ReactNode; -}; - -const ScanSectionHeader = ( { title, subtitle, controls }: Props ) => { - const Icon = getIconBySlug( 'protect' ); - const { hasPlan } = usePlan(); - - return ( -+ - - ); -}; - -export default ScanSectionHeader; diff --git a/projects/plugins/protect/src/js/routes/scan/scanning-admin-section-hero.tsx b/projects/plugins/protect/src/js/routes/scan/scanning-admin-section-hero.tsx new file mode 100644 index 0000000000000..49e99696cc4e0 --- /dev/null +++ b/projects/plugins/protect/src/js/routes/scan/scanning-admin-section-hero.tsx @@ -0,0 +1,64 @@ +import { Text } from '@automattic/jetpack-components'; +import { __, sprintf } from '@wordpress/i18n'; +import inProgressImage from '../../../../assets/images/in-progress.png'; +import AdminSectionHero from '../../components/admin-section-hero'; +import ProgressBar from '../../components/progress-bar'; +import ScanNavigation from '../../components/scan-navigation'; +import useScanStatusQuery from '../../data/scan/use-scan-status-query'; +import usePlan from '../../hooks/use-plan'; +import useWafData from '../../hooks/use-waf-data'; +import styles from './styles.module.scss'; + +const ScanningAdminSectionHero: React.FC = () => { + const { hasPlan } = usePlan(); + const { globalStats } = useWafData(); + const { data: status } = useScanStatusQuery( { usePolling: true } ); + const totalVulnerabilities = parseInt( globalStats?.totalVulnerabilities || '0' ); + const totalVulnerabilitiesFormatted = isNaN( totalVulnerabilities ) + ? '50,000' + : totalVulnerabilities.toLocaleString(); + + return ( +- -- -- { subtitle && ( --- <Icon size={ 32 } className={ styles[ 'scan-section-header__icon' ] } /> - { subtitle } - - ) } - { title && ( -- { title } - - ) } - { !! hasPlan &&} - --{ controls }-+ + { __( 'Your results will be ready soon', 'jetpack-protect' ) } + ++ <> + { hasPlan && ( + ++ ) } + + { sprintf( + // translators: placeholder is the number of total vulnerabilities i.e. "22,000". + __( + 'We are scanning for security threats from our more than %s listed vulnerabilities, powered by WPScan. This could take a minute or two.', + 'jetpack-protect' + ), + totalVulnerabilitiesFormatted + ) } + + +++ + } + secondary={ ++ ++ } + preserveSecondaryOnMobile={ false } + /> + ); +}; + +export default ScanningAdminSectionHero; diff --git a/projects/plugins/protect/src/js/routes/scan/styles.module.scss b/projects/plugins/protect/src/js/routes/scan/styles.module.scss index f48852795a657..0b5e90e21e7ae 100644 --- a/projects/plugins/protect/src/js/routes/scan/styles.module.scss +++ b/projects/plugins/protect/src/js/routes/scan/styles.module.scss @@ -1,11 +1,5 @@ -// Alert section -.main-content { - padding: calc( var( --spacing-base ) * 7 ) 0; // 56px | 0px -} - -.loading-content { - display: flex; - align-items: center; +.subheading-content { + font-weight: bold; } .illustration { @@ -19,57 +13,11 @@ } } -.connection-error-col { - margin-top: calc( var( --spacing-base ) * 3 + 1px ); // 25px -} - -.history-button-col { - display: flex; - justify-content: flex-end; - margin-top: calc( var( --spacing-base ) * 3 + 1px ); // 25px -} - -.scan-section-header { - > :first-child { - flex: 1; - } - - @media ( min-width: 960px ) { - display: flex; - align-items: flex-start; - } -} - -.scan-section-header__content { - display: flex; - flex-direction: column; - gap: var( --spacing-base ); // 8px - - > :last-child { - margin-top: calc( var( --spacing-base ) * 2 ); // 16px - } -} - -.scan-section-header__subtitle { - display: flex; - align-items: center; - color: var( --jp-black ); - margin-bottom: 0; +.product-section, .info-section { + margin-top: calc( var( --spacing-base ) * 7 ); // 56px + margin-bottom: calc( var( --spacing-base ) * 7 ); // 56px } -.scan-section-header__icon { - margin-left: -4px; // this fix a blank space on right/left from @wordpress/icons - margin-right: var( --spacing-base ); // 8px -} - -.scan-section-header__controls { - display: flex; - flex-direction: column; - align-items: flex-end; - gap: calc( var( --spacing-base ) * 2 ); // 16px -} - -.scan-section-header__controls__row { - display: flex; - gap: calc( var( --spacing-base ) * 2 ); // 16px -} +.scan-navigation { + margin-top: calc( var( --spacing-base ) * 3 ); // 24px +} \ No newline at end of file diff --git a/projects/plugins/protect/src/js/routes/setup/index.jsx b/projects/plugins/protect/src/js/routes/setup/index.jsx index 3e82bf582e41c..cf64ede35a3b4 100644 --- a/projects/plugins/protect/src/js/routes/setup/index.jsx +++ b/projects/plugins/protect/src/js/routes/setup/index.jsx @@ -4,10 +4,10 @@ import { Col, Container, Text, + JetpackProtectLogo, } from '@automattic/jetpack-components'; import { createInterpolateElement } from '@wordpress/element'; import { __ } from '@wordpress/i18n'; -import Logo from '../../components/logo'; import ConnectedPricingTable from '../../components/pricing-table'; import useAnalyticsTracks from '../../hooks/use-analytics-tracks'; import styles from './styles.module.scss'; @@ -25,7 +25,7 @@ const SetupRoute = () => { moduleName={ __( 'Jetpack Protect', 'jetpack-protect' ) } header={-+ { createInterpolateElement( __( diff --git a/projects/plugins/protect/src/js/types/scans.ts b/projects/plugins/protect/src/js/types/scans.ts index 7e76cd8be7ab9..98cf04de3fb3a 100644 --- a/projects/plugins/protect/src/js/types/scans.ts +++ b/projects/plugins/protect/src/js/types/scans.ts @@ -28,7 +28,7 @@ export type ScanStatus = { fixableThreatIds: number[]; /** The current scan progress, only available from the Scan API. */ - current_progress: number | null; + currentProgress: number | null; /** The data source for the scan status. */ dataSource: 'protect_report' | 'scan_api'; diff --git a/projects/plugins/search/changelog/fix-sync-filter-null-array b/projects/plugins/search/changelog/fix-sync-filter-null-array new file mode 100644 index 0000000000000..3f56c90b3a7bf --- /dev/null +++ b/projects/plugins/search/changelog/fix-sync-filter-null-array @@ -0,0 +1,5 @@ +Significance: patch +Type: fixed +Comment: Sync: update filter parameter to avoid conflicts with other plugins. + + diff --git a/projects/plugins/search/changelog/update-tested-to-6-7 b/projects/plugins/search/changelog/update-tested-to-6-7 new file mode 100644 index 0000000000000..9c1d5b4fabb5f --- /dev/null +++ b/projects/plugins/search/changelog/update-tested-to-6-7 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: indicate compatibility with the upcoming version of WordPress - 6.7. diff --git a/projects/plugins/search/readme.txt b/projects/plugins/search/readme.txt index b101853e40996..d92746c11d472 100644 --- a/projects/plugins/search/readme.txt +++ b/projects/plugins/search/readme.txt @@ -3,7 +3,7 @@ Contributors: automattic, annamcphee, bluefuton, kangzj, jsnmoon, robfelty, gibr Tags: search, filter, woocommerce search, ajax search, product search, free cloud-based search Requires at least: 6.5 Requires PHP: 7.0 -Tested up to: 6.6 +Tested up to: 6.7 Stable tag: 1.4.0 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html diff --git a/projects/plugins/social/changelog/fix-jetpack-social-notes-clobber-other-cpts b/projects/plugins/social/changelog/fix-jetpack-social-notes-clobber-other-cpts new file mode 100644 index 0000000000000..8aac5c2fdff3e --- /dev/null +++ b/projects/plugins/social/changelog/fix-jetpack-social-notes-clobber-other-cpts @@ -0,0 +1,5 @@ +Significance: patch +Type: fixed +Comment: Resolves a bug in an unreleased feature + + diff --git a/projects/plugins/social/changelog/fix-social-og-tags-jetpack-dev-path b/projects/plugins/social/changelog/fix-social-og-tags-jetpack-dev-path new file mode 100644 index 0000000000000..79af3f25d3565 --- /dev/null +++ b/projects/plugins/social/changelog/fix-social-og-tags-jetpack-dev-path @@ -0,0 +1,4 @@ +Significance: patch +Type: fixed + +Added Jetpack Beta's slug to Social OG conflicting plugins diff --git a/projects/plugins/social/changelog/fix-sync-filter-null-array b/projects/plugins/social/changelog/fix-sync-filter-null-array new file mode 100644 index 0000000000000..3f56c90b3a7bf --- /dev/null +++ b/projects/plugins/social/changelog/fix-sync-filter-null-array @@ -0,0 +1,5 @@ +Significance: patch +Type: fixed +Comment: Sync: update filter parameter to avoid conflicts with other plugins. + + diff --git a/projects/plugins/social/changelog/update-social-initial-state-migrate-urls-on-social-admin b/projects/plugins/social/changelog/update-social-initial-state-migrate-urls-on-social-admin new file mode 100644 index 0000000000000..c23ee0fbdc59a --- /dev/null +++ b/projects/plugins/social/changelog/update-social-initial-state-migrate-urls-on-social-admin @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Initial State: Migrated URLs to script data diff --git a/projects/plugins/social/changelog/update-social-nuke-has-paid-plan b/projects/plugins/social/changelog/update-social-nuke-has-paid-plan new file mode 100644 index 0000000000000..59e08c72626b5 --- /dev/null +++ b/projects/plugins/social/changelog/update-social-nuke-has-paid-plan @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Initial state: Removed unused hasPaidPlan flag + + diff --git a/projects/plugins/social/changelog/update-social-replace-has-paid-features-check b/projects/plugins/social/changelog/update-social-replace-has-paid-features-check new file mode 100644 index 0000000000000..bf9a130af83ec --- /dev/null +++ b/projects/plugins/social/changelog/update-social-replace-has-paid-features-check @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Initial State: Migrated hasPaidFeatures flag with feature check on front-end + + diff --git a/projects/plugins/social/changelog/update-tested-to-6-7 b/projects/plugins/social/changelog/update-tested-to-6-7 new file mode 100644 index 0000000000000..9c1d5b4fabb5f --- /dev/null +++ b/projects/plugins/social/changelog/update-tested-to-6-7 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: indicate compatibility with the upcoming version of WordPress - 6.7. diff --git a/projects/plugins/social/package.json b/projects/plugins/social/package.json index 2684baf5c991f..f5c3bd624b4d2 100644 --- a/projects/plugins/social/package.json +++ b/projects/plugins/social/package.json @@ -30,6 +30,7 @@ "@automattic/jetpack-components": "workspace:*", "@automattic/jetpack-connection": "workspace:*", "@automattic/jetpack-publicize-components": "workspace:*", + "@automattic/jetpack-script-data": "workspace:*", "@automattic/jetpack-shared-extension-utils": "workspace:*", "@wordpress/api-fetch": "7.9.0", "@wordpress/components": "28.9.0", diff --git a/projects/plugins/social/readme.txt b/projects/plugins/social/readme.txt index 73e34ae18e14a..d8d7e67b23062 100644 --- a/projects/plugins/social/readme.txt +++ b/projects/plugins/social/readme.txt @@ -3,7 +3,7 @@ Contributors: automattic, pabline, siddarthan, gmjuhasz, manzoorwanijk Tags: social media automation, social media scheduling, auto share, social sharing, social media marketing Requires at least: 6.5 Requires PHP: 7.0 -Tested up to: 6.6 +Tested up to: 6.7 Stable tag: 4.5.1 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html diff --git a/projects/plugins/social/src/class-meta-tags.php b/projects/plugins/social/src/class-meta-tags.php index 7846317c01606..ab3d2ee03fcef 100644 --- a/projects/plugins/social/src/class-meta-tags.php +++ b/projects/plugins/social/src/class-meta-tags.php @@ -23,6 +23,7 @@ class Meta_Tags { */ private $open_graph_conflicting_plugins = array( 'jetpack/jetpack.php', // The Jetpack plugin adds its own meta tags. + 'jetpack-dev/jetpack.php', // Jetpack's location with the beta plugin. '2-click-socialmedia-buttons/2-click-socialmedia-buttons.php', // 2 Click Social Media Buttons. 'add-link-to-facebook/add-link-to-facebook.php', // Add Link to Facebook. 'add-meta-tags/add-meta-tags.php', // Add Meta Tags. diff --git a/projects/plugins/social/src/class-note.php b/projects/plugins/social/src/class-note.php index c1326f7f66683..73aa53395f6cd 100644 --- a/projects/plugins/social/src/class-note.php +++ b/projects/plugins/social/src/class-note.php @@ -155,14 +155,16 @@ public function register_cpt() { * @return array The allowed blocks. */ public function restrict_blocks_for_social_note( $allowed_blocks, $post ) { - if ( 'jetpack-social-note' === $post->post_type ) { - // Only allow the paragraph block and the featured image block. - $allowed_blocks = array( - 'core/paragraph', - 'core/post-featured-image', - ); + if ( 'jetpack-social-note' !== $post->post_type ) { // Let 'em pass. + return $allowed_blocks; } + // Only allow the paragraph block and the featured image block. + $allowed_blocks = array( + 'core/paragraph', + 'core/post-featured-image', + ); + /** * Filters the blocks available to the Social Notes CPT. * diff --git a/projects/plugins/social/src/js/components/admin-page/header/index.jsx b/projects/plugins/social/src/js/components/admin-page/header/index.jsx index 0a2eb23d3509a..cc6aad10da338 100644 --- a/projects/plugins/social/src/js/components/admin-page/header/index.jsx +++ b/projects/plugins/social/src/js/components/admin-page/header/index.jsx @@ -1,4 +1,5 @@ import { SOCIAL_STORE_ID } from '@automattic/jetpack-publicize-components'; +import { getMyJetpackUrl } from '@automattic/jetpack-script-data'; import { useSelect } from '@wordpress/data'; import { createInterpolateElement } from '@wordpress/element'; import { __ } from '@wordpress/i18n'; @@ -6,14 +7,14 @@ import Logo from './../../logo'; import styles from './styles.module.scss'; const AdminPageHeader = () => { - const { showPricingPage, activateLicenseUrl } = useSelect( select => { + const { showPricingPage } = useSelect( select => { const store = select( SOCIAL_STORE_ID ); return { showPricingPage: store.showPricingPage(), - activateLicenseUrl: `${ store.getAdminUrl() }admin.php?page=my-jetpack#/add-license`, }; } ); + const activateLicenseUrl = getMyJetpackUrl( '#/add-license' ); return ( - { ! hasPaidFeatures ? ( + { ! hasSocialPaidFeatures() ? (diff --git a/projects/plugins/social/src/js/components/admin-page/index.jsx b/projects/plugins/social/src/js/components/admin-page/index.jsx index fcb351364013c..4f97dd0656bca 100644 --- a/projects/plugins/social/src/js/components/admin-page/index.jsx +++ b/projects/plugins/social/src/js/components/admin-page/index.jsx @@ -7,7 +7,10 @@ import { GlobalNotices, } from '@automattic/jetpack-components'; import { useConnection } from '@automattic/jetpack-connection'; -import { store as socialStore } from '@automattic/jetpack-publicize-components'; +import { + hasSocialPaidFeatures, + store as socialStore, +} from '@automattic/jetpack-publicize-components'; import { useSelect, useDispatch } from '@wordpress/data'; import { useState, useCallback, useEffect, useRef } from '@wordpress/element'; import React from 'react'; @@ -34,7 +37,6 @@ const Admin = () => { const { isModuleEnabled, showPricingPage, - hasPaidFeatures, pluginVersion, isSocialImageGeneratorAvailable, isUpdatingJetpackSettings, @@ -43,7 +45,6 @@ const Admin = () => { return { isModuleEnabled: store.isModuleEnabled(), showPricingPage: store.showPricingPage(), - hasPaidFeatures: store.hasPaidFeatures(), pluginVersion: store.getPluginVersion(), isSocialImageGeneratorAvailable: store.isSocialImageGeneratorAvailable(), isUpdatingJetpackSettings: store.isUpdatingJetpackSettings(), @@ -76,7 +77,7 @@ const Admin = () => { return (diff --git a/projects/plugins/social/src/js/components/social-module-toggle/index.tsx b/projects/plugins/social/src/js/components/social-module-toggle/index.tsx index bb7c0ef23dbb9..6d955bc2f817d 100644 --- a/projects/plugins/social/src/js/components/social-module-toggle/index.tsx +++ b/projects/plugins/social/src/js/components/social-module-toggle/index.tsx @@ -9,6 +9,7 @@ import { ConnectionManagement, SOCIAL_STORE_ID, getSocialScriptData, + hasSocialPaidFeatures, } from '@automattic/jetpack-publicize-components'; import { ExternalLink } from '@wordpress/components'; import { useSelect, useDispatch } from '@wordpress/data'; @@ -22,25 +23,23 @@ import styles from './styles.module.scss'; const SocialModuleToggle: React.FC = () => { const { // TODO - replace some of these with values from initial state - connectionsAdminUrl, isModuleEnabled, isUpdating, siteSuffix, blogID, - hasPaidFeatures, } = useSelect( select => { const store = select( SOCIAL_STORE_ID ) as SocialStoreSelectors; return { isModuleEnabled: store.isModuleEnabled(), isUpdating: store.isUpdatingJetpackSettings(), - connectionsAdminUrl: store.getConnectionsAdminUrl(), siteSuffix: store.getSiteSuffix(), blogID: store.getBlogID(), - hasPaidFeatures: store.hasPaidFeatures(), }; }, [] ); - const { useAdminUiV1 } = getSocialScriptData().feature_flags; + const { urls, feature_flags } = getSocialScriptData(); + + const useAdminUiV1 = feature_flags.useAdminUiV1; const updateOptions = useDispatch( SOCIAL_STORE_ID ).updateJetpackSettings; @@ -65,13 +64,13 @@ const SocialModuleToggle: React.FC = () => { ) : null; } - return connectionsAdminUrl ? ( + return urls.connectionsManagementPage ? (}> - { ( ! hasPaidFeatures && showPricingPage ) || forceDisplayPricingPage ? ( + { ( ! hasSocialPaidFeatures() && showPricingPage ) || forceDisplayPricingPage ? ( diff --git a/projects/plugins/social/src/js/components/admin-page/test/index.test.jsx b/projects/plugins/social/src/js/components/admin-page/test/index.test.jsx index fe6184c585049..e24423098cdb0 100644 --- a/projects/plugins/social/src/js/components/admin-page/test/index.test.jsx +++ b/projects/plugins/social/src/js/components/admin-page/test/index.test.jsx @@ -13,7 +13,6 @@ describe( 'load the app', () => { let storeSelect; renderHook( () => useSelect( select => ( storeSelect = select( SOCIAL_STORE_ID ) ) ) ); jest.spyOn( storeSelect, 'showPricingPage' ).mockReset().mockReturnValue( true ); - jest.spyOn( storeSelect, 'hasPaidPlan' ).mockReset().mockReturnValue( true ); jest.spyOn( storeSelect, 'getPluginVersion' ).mockReset().mockReturnValue( version ); render( ); expect( screen.getByText( `Jetpack Social ${ version }` ) ).toBeInTheDocument(); diff --git a/projects/plugins/social/src/js/components/header/index.js b/projects/plugins/social/src/js/components/header/index.js index 868c0756b61fe..742c758aa957f 100644 --- a/projects/plugins/social/src/js/components/header/index.js +++ b/projects/plugins/social/src/js/components/header/index.js @@ -13,6 +13,7 @@ import { getSharedPostsCount, store as socialStore, } from '@automattic/jetpack-publicize-components'; +import { getAdminUrl } from '@automattic/jetpack-script-data'; import { useDispatch, useSelect } from '@wordpress/data'; import { __ } from '@wordpress/i18n'; import { Icon, postList } from '@wordpress/icons'; @@ -20,24 +21,17 @@ import StatCards from '../stat-cards'; import styles from './styles.module.scss'; const Header = () => { - const connectionData = window.jetpackSocialInitialState.connectionData ?? {}; - const { - // TODO - Replace some of these with data from initial state - connectionsAdminUrl, - hasConnections, - isModuleEnabled, - newPostUrl, - } = useSelect( select => { + const { hasConnections, isModuleEnabled } = useSelect( select => { const store = select( socialStore ); return { - connectionsAdminUrl: connectionData.adminUrl, hasConnections: store.getConnections().length > 0, isModuleEnabled: store.isModuleEnabled(), - newPostUrl: `${ store.getAdminUrl() }post-new.php`, }; } ); - const { useAdminUiV1 } = getSocialScriptData().feature_flags; + const { urls, feature_flags } = getSocialScriptData(); + + const useAdminUiV1 = feature_flags.useAdminUiV1; const { hasConnectionError } = useConnectionErrorNotice(); @@ -71,13 +65,16 @@ const Header = () => { { __( 'Connect accounts', 'jetpack-social' ) } ) : ( - }; const SocialNotesToggle: React.FC< SocialNotesToggleProps > = ( { disabled } ) => { - const { isEnabled, notesConfig, newNoteUrl } = useSelect( select => { + const { isEnabled, notesConfig } = useSelect( select => { const store = select( socialStore ); return { isEnabled: store.isSocialNotesEnabled(), notesConfig: store.getSocialNotesConfig(), - newNoteUrl: `${ store.getAdminUrl() }post-new.php?post_type=jetpack-social-note`, // Temporarily we disable forever after action to wait for the page to reload. // isUpdating: store.isSocialNotesSettingsUpdating(), }; }, [] ); + const newNoteUrl = getAdminUrl( 'post-new.php?post_type=jetpack-social-note' ); + const [ isUpdating, setIsUpdating ] = useState( false ); const [ isAppendLinkToggleUpdating, setIsAppendLinkToggleUpdating ] = useState( false ); const [ isLinkFormatUpdating, setIsLinkFormatUpdating ] = useState( false ); diff --git a/projects/plugins/social/src/js/components/support-section/index.js b/projects/plugins/social/src/js/components/support-section/index.js index f835d0ec753a2..12a700c250373 100644 --- a/projects/plugins/social/src/js/components/support-section/index.js +++ b/projects/plugins/social/src/js/components/support-section/index.js @@ -4,9 +4,8 @@ import { getRedirectUrl, useBreakpointMatch, } from '@automattic/jetpack-components'; -import { SOCIAL_STORE_ID } from '@automattic/jetpack-publicize-components'; +import { hasSocialPaidFeatures } from '@automattic/jetpack-publicize-components'; import { ExternalLink } from '@wordpress/components'; -import { useSelect } from '@wordpress/data'; import { __ } from '@wordpress/i18n'; import { Icon, lifesaver } from '@wordpress/icons'; import clsx from 'clsx'; @@ -15,9 +14,8 @@ import styles from './styles.module.scss'; const SupportSection = () => { const [ isAtLeastMedium ] = useBreakpointMatch( 'md', '>=' ); - const hasPaidPlan = useSelect( select => select( SOCIAL_STORE_ID ).hasPaidPlan() ); - if ( ! hasPaidPlan ) { + if ( ! hasSocialPaidFeatures() ) { return null; } diff --git a/projects/plugins/social/src/js/components/types/types.ts b/projects/plugins/social/src/js/components/types/types.ts index 88e1472f67257..a7047318cfcd5 100644 --- a/projects/plugins/social/src/js/components/types/types.ts +++ b/projects/plugins/social/src/js/components/types/types.ts @@ -7,13 +7,10 @@ type JetpackSettingsSelectors = { isModuleEnabled: () => boolean; showPricingPage: () => boolean; isUpdatingJetpackSettings: () => boolean; - hasPaidPlan: () => boolean; - hasPaidFeatures: () => boolean; }; type ConnectionDataSelectors = { getConnections: () => Array< object >; - getConnectionsAdminUrl: () => string; hasConnections: () => boolean; }; diff --git a/projects/plugins/starter-plugin/changelog/fix-sync-filter-null-array b/projects/plugins/starter-plugin/changelog/fix-sync-filter-null-array new file mode 100644 index 0000000000000..3f56c90b3a7bf --- /dev/null +++ b/projects/plugins/starter-plugin/changelog/fix-sync-filter-null-array @@ -0,0 +1,5 @@ +Significance: patch +Type: fixed +Comment: Sync: update filter parameter to avoid conflicts with other plugins. + + diff --git a/projects/plugins/starter-plugin/changelog/update-tested-to-6-7 b/projects/plugins/starter-plugin/changelog/update-tested-to-6-7 new file mode 100644 index 0000000000000..9c1d5b4fabb5f --- /dev/null +++ b/projects/plugins/starter-plugin/changelog/update-tested-to-6-7 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: indicate compatibility with the upcoming version of WordPress - 6.7. diff --git a/projects/plugins/starter-plugin/readme.txt b/projects/plugins/starter-plugin/readme.txt index d7247adfd9b82..fc71a8c2afa8d 100644 --- a/projects/plugins/starter-plugin/readme.txt +++ b/projects/plugins/starter-plugin/readme.txt @@ -3,7 +3,7 @@ Contributors: automattic, Tags: jetpack, stuff Requires at least: 6.5 Requires PHP: 7.0 -Tested up to: 6.6 +Tested up to: 6.7 Stable tag: 0.1.0-alpha License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html diff --git a/projects/plugins/super-cache/changelog/update-tested-to-6-7 b/projects/plugins/super-cache/changelog/update-tested-to-6-7 new file mode 100644 index 0000000000000..9c1d5b4fabb5f --- /dev/null +++ b/projects/plugins/super-cache/changelog/update-tested-to-6-7 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: indicate compatibility with the upcoming version of WordPress - 6.7. diff --git a/projects/plugins/super-cache/readme.txt b/projects/plugins/super-cache/readme.txt index c6dd882e926b7..46e8d72e2a528 100644 --- a/projects/plugins/super-cache/readme.txt +++ b/projects/plugins/super-cache/readme.txt @@ -3,7 +3,7 @@ Contributors: donncha, automattic, adnan007, dilirity, mikemayhem3030, pyronaur, Tags: performance, caching, wp-cache, wp-super-cache, cache Requires at least: 6.5 Requires PHP: 7.0 -Tested up to: 6.6 +Tested up to: 6.7 Stable tag: 1.12.3 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html diff --git a/projects/plugins/vaultpress/changelog/update-tested-to-6-7 b/projects/plugins/vaultpress/changelog/update-tested-to-6-7 new file mode 100644 index 0000000000000..9c1d5b4fabb5f --- /dev/null +++ b/projects/plugins/vaultpress/changelog/update-tested-to-6-7 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: indicate compatibility with the upcoming version of WordPress - 6.7. diff --git a/projects/plugins/vaultpress/readme.txt b/projects/plugins/vaultpress/readme.txt index 1bbab848cc65b..806aad2e538c3 100644 --- a/projects/plugins/vaultpress/readme.txt +++ b/projects/plugins/vaultpress/readme.txt @@ -2,7 +2,7 @@ Contributors: automattic, annezazu, apokalyptik, bjorsch, briancolinger, dsmart, georgestephanis, initsogar, jeherve, josephscott, miguelxavierpenha, rachelsquirrel, rdcoll, sdixon194, shaunandrews, thingalon, viper007bond, williamvianas, xknown Tags: security, malware, virus, archive, back up, back ups, backup, backups, scanning, restore, wordpress backup, site backup, website backup Requires at least: 5.2 -Tested up to: 6.6 +Tested up to: 6.7 Stable tag: 3.0.0 Requires PHP: 7.0 License: GPLv2 diff --git a/projects/plugins/videopress/changelog/fix-sync-filter-null-array b/projects/plugins/videopress/changelog/fix-sync-filter-null-array new file mode 100644 index 0000000000000..3f56c90b3a7bf --- /dev/null +++ b/projects/plugins/videopress/changelog/fix-sync-filter-null-array @@ -0,0 +1,5 @@ +Significance: patch +Type: fixed +Comment: Sync: update filter parameter to avoid conflicts with other plugins. + + diff --git a/projects/plugins/videopress/changelog/update-tested-to-6-7 b/projects/plugins/videopress/changelog/update-tested-to-6-7 new file mode 100644 index 0000000000000..9c1d5b4fabb5f --- /dev/null +++ b/projects/plugins/videopress/changelog/update-tested-to-6-7 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: indicate compatibility with the upcoming version of WordPress - 6.7. diff --git a/projects/plugins/videopress/readme.txt b/projects/plugins/videopress/readme.txt index 6a1c764eb5d7b..c33cf2d2c791c 100644 --- a/projects/plugins/videopress/readme.txt +++ b/projects/plugins/videopress/readme.txt @@ -3,7 +3,7 @@ Contributors: automattic, retrofox, oskosk, thehenridev, renatoagds, lhkowalski, Tags: video, video-hosting, video-player, cdn, video-streaming Requires at least: 6.5 -Tested up to: 6.6 +Tested up to: 6.7 Stable tag: 1.5 Requires PHP: 7.0 License: GPLv2 or later diff --git a/projects/plugins/wpcomsh/changelog/f26d-studio-sync-plan-feature b/projects/plugins/wpcomsh/changelog/f26d-studio-sync-plan-feature new file mode 100644 index 0000000000000..503f84d590ee0 --- /dev/null +++ b/projects/plugins/wpcomsh/changelog/f26d-studio-sync-plan-feature @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +WordPress.com plan features: Added studio-sync feature diff --git a/projects/plugins/wpcomsh/changelog/fix-sync-filter-null-array b/projects/plugins/wpcomsh/changelog/fix-sync-filter-null-array new file mode 100644 index 0000000000000..3f56c90b3a7bf --- /dev/null +++ b/projects/plugins/wpcomsh/changelog/fix-sync-filter-null-array @@ -0,0 +1,5 @@ +Significance: patch +Type: fixed +Comment: Sync: update filter parameter to avoid conflicts with other plugins. + + diff --git a/projects/plugins/wpcomsh/changelog/update-tested-to-6-7 b/projects/plugins/wpcomsh/changelog/update-tested-to-6-7 new file mode 100644 index 0000000000000..9c1d5b4fabb5f --- /dev/null +++ b/projects/plugins/wpcomsh/changelog/update-tested-to-6-7 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: indicate compatibility with the upcoming version of WordPress - 6.7. diff --git a/projects/plugins/wpcomsh/readme.txt b/projects/plugins/wpcomsh/readme.txt index fe8982f76a15a..88e4d494dff7e 100644 --- a/projects/plugins/wpcomsh/readme.txt +++ b/projects/plugins/wpcomsh/readme.txt @@ -3,7 +3,7 @@ Contributors: lamosty, obenland, automattic Tags: WP.com Requires at least: 6.5 Requires PHP: 7.4 -Tested up to: 6.6 +Tested up to: 6.7 Stable tag: trunk License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html diff --git a/projects/plugins/wpcomsh/wpcom-features/class-wpcom-features.php b/projects/plugins/wpcomsh/wpcom-features/class-wpcom-features.php index 2fe25a7cc4afb..1916f4a83d79a 100644 --- a/projects/plugins/wpcomsh/wpcom-features/class-wpcom-features.php +++ b/projects/plugins/wpcomsh/wpcom-features/class-wpcom-features.php @@ -429,6 +429,7 @@ class WPCOM_Features { public const STAGING_SITES = 'staging-sites'; public const STATS_FREE = 'stats-free'; public const STATS_PAID = 'stats-paid'; + public const STUDIO_SYNC = 'studio-sync'; public const SUBSCRIBER_UNLIMITED_IMPORTS = 'subscriber-unlimited-imports'; public const SUBSCRIPTION_GIFTING = 'subscription-gifting'; public const SUPPORT = 'support'; @@ -1154,6 +1155,9 @@ class WPCOM_Features { self::JETPACK_STATS_YEARLY, self::JETPACK_COMPLETE_PLANS, ), + self::STUDIO_SYNC => array( + self::WPCOM_BUSINESS_AND_HIGHER_PLANS, + ), // Importing subscribers to the site without limits. self::SUBSCRIBER_UNLIMITED_IMPORTS => array( diff --git a/tools/cli/commands/build.js b/tools/cli/commands/build.js index 41d25232bf875..1e85a759326f9 100644 --- a/tools/cli/commands/build.js +++ b/tools/cli/commands/build.js @@ -612,6 +612,15 @@ async function buildProject( t ) { () => false ) ) { + // If we're building changelogger itself, we need to install before we can run it. + if ( t.project === 'packages/changelogger' ) { + await t.execa( 'composer', await getInstallArgs( t.project, 'composer', t.argv ), { + cwd: t.cwd, + stdio: [ 'ignore', 'inherit', 'inherit' ], + buffer: false, + } ); + } + let prerelease = 'alpha'; if ( composerJson.extra?.[ 'dev-releases' ] ) { const m = ( diff --git a/tools/cli/commands/changelog.js b/tools/cli/commands/changelog.js index 9319a3e1c6843..5b24a6c7237f5 100644 --- a/tools/cli/commands/changelog.js +++ b/tools/cli/commands/changelog.js @@ -311,7 +311,8 @@ async function changelogAdd( argv ) { return; } - let changelogInfo, needChangelog; + let changelogInfo, + needChangelog = []; if ( argv.project ) { needChangelog = [ argv.project ]; @@ -695,7 +696,11 @@ async function checkChangelogFiles() { const branchReg = /\/branch-/; // match example: jetpack/branch-1.2.3 if ( currentBranch.match( branchReg ) ) { console.log( chalk.green( 'Release branch detected. No changelog required.' ) ); - return []; + return { + touched: [], + files: new Map(), + need: [], + }; } const re1 = /^projects\/([^/]+\/[^/]+)\//; // regex matches project file path, ie 'project/packages/connection/..' diff --git a/tools/cli/commands/generate.js b/tools/cli/commands/generate.js index f872709139c88..8a6f54a01d777 100644 --- a/tools/cli/commands/generate.js +++ b/tools/cli/commands/generate.js @@ -958,7 +958,7 @@ function createReadMeTxt( answers ) { 'Tags: jetpack, stuff\n' + 'Requires at least: 6.5\n' + 'Requires PHP: 7.0\n' + - 'Tested up to: 6.6\n' + + 'Tested up to: 6.7\n' + `Stable tag: ${ answers.version }\n` + 'License: GPLv2 or later\n' + 'License URI: http://www.gnu.org/licenses/gpl-2.0.html\n' + diff --git a/tools/e2e-commons/bin/performance.js b/tools/e2e-commons/bin/performance.js index 458589848d894..87a84e462d2bc 100644 --- a/tools/e2e-commons/bin/performance.js +++ b/tools/e2e-commons/bin/performance.js @@ -2,7 +2,7 @@ import { spawn } from 'child_process'; import { readFileSync, writeFileSync, existsSync } from 'fs'; import path from 'path'; import { URL } from 'url'; -import { mergeWith, isArray } from 'lodash'; +import { mergeWith, isArray } from 'lodash-es'; import { prerequisitesBuilder } from '../env/prerequisites.js'; import { execSyncShellCommand, execWpCommand, resolveSiteUrl } from '../helpers/utils-helper.js'; diff --git a/tools/e2e-commons/package.json b/tools/e2e-commons/package.json index f57db8f386264..87de25ba9f28f 100644 --- a/tools/e2e-commons/package.json +++ b/tools/e2e-commons/package.json @@ -21,12 +21,13 @@ "devDependencies": { "@playwright/test": "1.45.1", "@slack/web-api": "7.3.2", + "@types/lodash-es": "4.17.12", "allure-playwright": "2.9.2", "axios": "1.7.4", "chalk": "5.0.1", "config": "3.3.7", "localtunnel": "2.0.2", - "lodash": "4.17.21", + "lodash-es": "4.17.21", "node-fetch": "2.6.7", "shell-escape": "0.2.0", "winston": "3.8.1",