diff --git a/projects/plugins/jetpack/_inc/client/recommendations/prompts/product-suggestions/index.jsx b/projects/plugins/jetpack/_inc/client/recommendations/prompts/product-suggestions/index.jsx
index 1641755388bf6..3be7c3f10f7b7 100644
--- a/projects/plugins/jetpack/_inc/client/recommendations/prompts/product-suggestions/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/recommendations/prompts/product-suggestions/index.jsx
@@ -1,7 +1,7 @@
import { __ } from '@wordpress/i18n';
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
import { connect } from 'react-redux';
-import { Redirect } from 'react-router-dom';
+import { Navigate } from 'react-router-dom';
import { JetpackLoadingIcon } from 'components/jetpack-loading-icon';
import { MoneyBackGuarantee } from 'components/money-back-guarantee';
import {
@@ -41,7 +41,7 @@ const ProductSuggestionsComponent = ( {
// We have to remove the first "#" value from the next route value
// so React Router will match it with one of the other recommendations paths.
// E.g. "#/recommendations/monitor" => "/recommendations/monitor".
- return
Date: Wed, 8 Jan 2025 15:33:28 -0800
Subject: [PATCH 06/99] WPCOMSH: Use WP_CLI to activate wordads module
post-transfer (#40909)
* Enable wordads module via WP_CLI. Add success logging
* changelog
---
.../update-wordads-wpcomsh-post-transfer | 4 ++++
projects/plugins/wpcomsh/woa.php | 16 ++++++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
create mode 100644 projects/plugins/wpcomsh/changelog/update-wordads-wpcomsh-post-transfer
diff --git a/projects/plugins/wpcomsh/changelog/update-wordads-wpcomsh-post-transfer b/projects/plugins/wpcomsh/changelog/update-wordads-wpcomsh-post-transfer
new file mode 100644
index 0000000000000..d724bbe881f31
--- /dev/null
+++ b/projects/plugins/wpcomsh/changelog/update-wordads-wpcomsh-post-transfer
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+woa: Enable wordads module via WP_CLI post transfer
diff --git a/projects/plugins/wpcomsh/woa.php b/projects/plugins/wpcomsh/woa.php
index b75df2dea8597..9bc9b64ffd4f5 100644
--- a/projects/plugins/wpcomsh/woa.php
+++ b/projects/plugins/wpcomsh/woa.php
@@ -250,18 +250,22 @@ function wpcomsh_woa_post_process_maybe_enable_wordads( $args, $assoc_args ) {
return;
}
+ // Set WordAds options.
foreach ( $options_decoded as $option => $value ) {
// Convert boolean options to string first to work around update_option not setting the option if the value is false.
// This sets the option to either '1' if true or '' if false.
update_option( $option, is_bool( $value ) ? (string) $value : $value );
}
- if ( ! defined( 'JETPACK__VERSION' ) || ! class_exists( 'Jetpack' ) ) {
- return;
- }
+ // Activate the WordAds module.
+ WP_CLI::runcommand(
+ 'jetpack module activate wordads',
+ array(
+ 'launch' => false,
+ 'exit_error' => false,
+ )
+ );
- if ( ! Jetpack::is_module_active( 'wordads' ) ) {
- Jetpack::activate_module( 'wordads', false, false );
- }
+ WP_CLI::success( 'WordAds options transferred and module activated' );
}
add_action( 'wpcomsh_woa_post_transfer', 'wpcomsh_woa_post_process_maybe_enable_wordads', 10, 2 );
From 42a62f9821d4d5c89866e09813eafaad7648d243 Mon Sep 17 00:00:00 2001
From: Adam Wood <1017872+adamwoodnz@users.noreply.github.com>
Date: Thu, 9 Jan 2025 20:48:33 +1300
Subject: [PATCH 07/99] Stop showing limited global styles notice in editor
distraction free mode (#40907)
* Stop showing limited global styles notice in editor distraction free mode
Fixes https://github.com/Automattic/jetpack/issues/40906
* changelog
* Alter logic to remove the notice in distraction free mode
---
.../fix-global-styles-notice-distraction-free | 4 ++++
.../src/features/wpcom-global-styles/notices.js | 17 +++++++++++++++--
.../fix-global-styles-notice-distraction-free | 4 ++++
.../fix-global-styles-notice-distraction-free | 4 ++++
4 files changed, 27 insertions(+), 2 deletions(-)
create mode 100644 projects/packages/jetpack-mu-wpcom/changelog/fix-global-styles-notice-distraction-free
create mode 100644 projects/plugins/mu-wpcom-plugin/changelog/fix-global-styles-notice-distraction-free
create mode 100644 projects/plugins/wpcomsh/changelog/fix-global-styles-notice-distraction-free
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/fix-global-styles-notice-distraction-free b/projects/packages/jetpack-mu-wpcom/changelog/fix-global-styles-notice-distraction-free
new file mode 100644
index 0000000000000..fb897e76fe370
--- /dev/null
+++ b/projects/packages/jetpack-mu-wpcom/changelog/fix-global-styles-notice-distraction-free
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Global Styles: Stop showing the limited global styles notice in distraction free mode.
diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-global-styles/notices.js b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-global-styles/notices.js
index 16cd184be1ac0..c0d9ca64467dc 100644
--- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-global-styles/notices.js
+++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-global-styles/notices.js
@@ -1,5 +1,6 @@
/* global wpcomGlobalStyles */
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { store as blockEditorStore } from '@wordpress/block-editor';
import { ExternalLink, Notice } from '@wordpress/components';
import { useDispatch, useSelect } from '@wordpress/data';
import {
@@ -238,19 +239,31 @@ function GlobalStylesEditNotice() {
upgradePlan,
] );
+ const isDistractionFree = useSelect(
+ select => select( blockEditorStore ).getSettings().isDistractionFree,
+ []
+ );
+
useEffect( () => {
if ( ! isSiteEditor && ! isPostEditor ) {
return;
}
- if ( globalStylesInUse ) {
+ if ( globalStylesInUse && ! isDistractionFree ) {
showNotice();
} else {
removeNotice( NOTICE_ID );
}
return () => removeNotice( NOTICE_ID );
- }, [ globalStylesInUse, isSiteEditor, isPostEditor, removeNotice, showNotice ] );
+ }, [
+ globalStylesInUse,
+ isDistractionFree,
+ isSiteEditor,
+ isPostEditor,
+ removeNotice,
+ showNotice,
+ ] );
return null;
}
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/fix-global-styles-notice-distraction-free b/projects/plugins/mu-wpcom-plugin/changelog/fix-global-styles-notice-distraction-free
new file mode 100644
index 0000000000000..fb897e76fe370
--- /dev/null
+++ b/projects/plugins/mu-wpcom-plugin/changelog/fix-global-styles-notice-distraction-free
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Global Styles: Stop showing the limited global styles notice in distraction free mode.
diff --git a/projects/plugins/wpcomsh/changelog/fix-global-styles-notice-distraction-free b/projects/plugins/wpcomsh/changelog/fix-global-styles-notice-distraction-free
new file mode 100644
index 0000000000000..fb897e76fe370
--- /dev/null
+++ b/projects/plugins/wpcomsh/changelog/fix-global-styles-notice-distraction-free
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Global Styles: Stop showing the limited global styles notice in distraction free mode.
From 27b255e7293579acc82ebafaec972c9070552ba9 Mon Sep 17 00:00:00 2001
From: Manzoor Wani
Date: Thu, 9 Jan 2025 00:08:22 -0800
Subject: [PATCH 08/99] Social | Add site context for publicize endpoints
(#40914)
* Allow requests as blog in base controller
* Add filters for connections controller
* Add changelog
* Update baseline.php
* Rename the 'include' param to 'scope' for clarity
* Return shared connections by default
* Remove scope parameter in favour of request context
* Only pass test_connections to WPCOM
* Update baseline.php
---
.../packages/publicize/.phan/baseline.php | 6 ++-
.../add-filtering-for-publicize-endpoints | 4 ++
.../src/rest-api/class-base-controller.php | 31 +++++++++++-
.../rest-api/class-connections-controller.php | 48 ++++++++++++++-----
4 files changed, 74 insertions(+), 15 deletions(-)
create mode 100644 projects/packages/publicize/changelog/add-filtering-for-publicize-endpoints
diff --git a/projects/packages/publicize/.phan/baseline.php b/projects/packages/publicize/.phan/baseline.php
index ae1e8cfe766d4..283281754e1e6 100644
--- a/projects/packages/publicize/.phan/baseline.php
+++ b/projects/packages/publicize/.phan/baseline.php
@@ -17,6 +17,7 @@
// PhanPossiblyUndeclaredVariable : 2 occurrences
// PhanTypeMismatchReturnProbablyReal : 2 occurrences
// PhanTypeMissingReturn : 2 occurrences
+ // PhanUndeclaredClassMethod : 2 occurrences
// PhanImpossibleCondition : 1 occurrence
// PhanNoopNew : 1 occurrence
// PhanParamSignatureMismatch : 1 occurrence
@@ -28,6 +29,8 @@
// PhanTypeMismatchDefault : 1 occurrence
// PhanTypeMismatchDimFetch : 1 occurrence
// PhanTypeMismatchReturn : 1 occurrence
+ // PhanUndeclaredFunction : 1 occurrence
+ // PhanUndeclaredMethod : 1 occurrence
// Currently, file_suppressions and directory_suppressions are the only supported suppressions
'file_suppressions' => [
@@ -38,7 +41,8 @@
'src/class-publicize-ui.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanTypeMismatchReturnProbablyReal'],
'src/class-publicize.php' => ['PhanParamSignatureMismatch', 'PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgument', 'PhanTypeMissingReturn'],
'src/class-rest-controller.php' => ['PhanPluginDuplicateConditionalNullCoalescing', 'PhanTypeMismatchReturnProbablyReal'],
- 'src/rest-api/class-connections-controller.php' => ['PhanPluginMixedKeyNoKey'],
+ 'src/rest-api/class-base-controller.php' => ['PhanUndeclaredClassMethod', 'PhanUndeclaredFunction'],
+ 'src/rest-api/class-connections-controller.php' => ['PhanPluginMixedKeyNoKey', 'PhanUndeclaredMethod'],
'src/social-image-generator/class-post-settings.php' => ['PhanPluginDuplicateConditionalNullCoalescing'],
'src/social-image-generator/class-rest-settings-controller.php' => ['PhanPluginMixedKeyNoKey'],
'src/social-image-generator/class-settings.php' => ['PhanPluginDuplicateConditionalNullCoalescing'],
diff --git a/projects/packages/publicize/changelog/add-filtering-for-publicize-endpoints b/projects/packages/publicize/changelog/add-filtering-for-publicize-endpoints
new file mode 100644
index 0000000000000..90fd57e7a5a4b
--- /dev/null
+++ b/projects/packages/publicize/changelog/add-filtering-for-publicize-endpoints
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Publicize: Allow filtering of connections in publicize rest endpoint
diff --git a/projects/packages/publicize/src/rest-api/class-base-controller.php b/projects/packages/publicize/src/rest-api/class-base-controller.php
index acf0aa0c78cc2..86ca5c8e40a52 100644
--- a/projects/packages/publicize/src/rest-api/class-base-controller.php
+++ b/projects/packages/publicize/src/rest-api/class-base-controller.php
@@ -18,6 +18,13 @@
*/
abstract class Base_Controller extends WP_REST_Controller {
+ /**
+ * Whether to allow requests as blog.
+ *
+ * @var bool
+ */
+ protected $allow_requests_as_blog = false;
+
/**
* Constructor.
*/
@@ -34,6 +41,22 @@ public static function is_wpcom() {
return ( new Host() )->is_wpcom_simple();
}
+ /**
+ * Check if the request is authorized for the blog.
+ *
+ * @return bool
+ */
+ protected static function is_authorized_blog_request() {
+ if ( self::is_wpcom() && is_jetpack_site( get_current_blog_id() ) ) {
+
+ $jp_auth_endpoint = new \WPCOM_REST_API_V2_Endpoint_Jetpack_Auth();
+
+ return $jp_auth_endpoint->is_jetpack_authorized_for_site() === true;
+ }
+
+ return false;
+ }
+
/**
* Filters out data based on ?_fields= request parameter
*
@@ -59,9 +82,11 @@ public function prepare_item_for_response( $item, $request ) {
/**
* Verify that user can access Publicize data
*
+ * @param WP_REST_Request $request Full details about the request.
* @return true|WP_Error
*/
- public function get_items_permission_check() {
+ public function get_items_permissions_check( $request ) {// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+
global $publicize;
if ( ! $publicize ) {
@@ -72,6 +97,10 @@ public function get_items_permission_check() {
);
}
+ if ( $this->allow_requests_as_blog && self::is_authorized_blog_request() ) {
+ return true;
+ }
+
if ( $publicize->current_user_can_access_publicize_data() ) {
return true;
}
diff --git a/projects/packages/publicize/src/rest-api/class-connections-controller.php b/projects/packages/publicize/src/rest-api/class-connections-controller.php
index f1710bca05a93..873f61851ebc5 100644
--- a/projects/packages/publicize/src/rest-api/class-connections-controller.php
+++ b/projects/packages/publicize/src/rest-api/class-connections-controller.php
@@ -27,6 +27,8 @@ public function __construct() {
$this->namespace = 'wpcom/v2';
$this->rest_base = 'publicize/connections';
+ $this->allow_requests_as_blog = true;
+
add_action( 'rest_api_init', array( $this, 'register_routes' ) );
}
@@ -41,7 +43,7 @@ public function register_routes() {
array(
'methods' => WP_REST_Server::READABLE,
'callback' => array( $this, 'get_items' ),
- 'permission_callback' => array( $this, 'get_items_permission_check' ),
+ 'permission_callback' => array( $this, 'get_items_permissions_check' ),
'args' => array(
'test_connections' => array(
'type' => 'boolean',
@@ -165,23 +167,32 @@ public function get_item_schema() {
/**
* Get all connections. Meant to be called directly only on WPCOM.
*
- * @param bool $run_tests Whether to run tests on the connections.
+ * @param array $args Arguments
+ * - 'test_connections': bool Whether to run connection tests.
+ * - 'scope': enum('site', 'user') Which connections to include.
*
* @return array
*/
- protected static function get_all_connections( $run_tests = false ) {
+ protected static function get_all_connections( $args = array() ) {
/**
* Publicize instance.
- *
- * @var \Automattic\Jetpack\Publicize\Publicize $publicize
*/
global $publicize;
$items = array();
+ $run_tests = $args['test_connections'] ?? false;
+
$test_results = $run_tests ? self::get_connections_test_status() : array();
- foreach ( (array) $publicize->get_services( 'connected' ) as $service_name => $connections ) {
+ // If a (Jetpack) blog request, return all the connections for that site.
+ if ( self::is_authorized_blog_request() ) {
+ $service_connections = $publicize->get_all_connections_for_blog_id( get_current_blog_id() );
+ } else {
+ $service_connections = (array) $publicize->get_services( 'connected' );
+ }
+
+ foreach ( $service_connections as $service_name => $connections ) {
foreach ( $connections as $connection ) {
$connection_id = $publicize->get_connection_id( $connection );
@@ -219,13 +230,15 @@ protected static function get_all_connections( $run_tests = false ) {
/**
* Get a list of publicize connections.
*
- * @param bool $run_tests Whether to run tests on the connections.
+ * @param array $args Arguments.
+ *
+ * @see Automattic\Jetpack\Publicize\REST_API\Connections_Controller::get_all_connections()
*
* @return array
*/
- public static function get_connections( $run_tests = false ) {
+ public static function get_connections( $args = array() ) {
if ( self::is_wpcom() ) {
- return self::get_all_connections( $run_tests );
+ return self::get_all_connections( $args );
}
$site_id = Manager::get_site_id( true );
@@ -234,11 +247,17 @@ public static function get_connections( $run_tests = false ) {
}
$path = add_query_arg(
- array( 'test_connections' => $run_tests ),
+ array(
+ 'test_connections' => $args['test_connections'] ?? false,
+ ),
sprintf( '/sites/%d/publicize/connections', $site_id )
);
- $response = Client::wpcom_json_api_request_as_user( $path, 'v2', array( 'method' => 'GET' ) );
+ $blog_or_user = ( $args['scope'] ?? '' ) === 'site' ? 'blog' : 'user';
+
+ $callback = array( Client::class, "wpcom_json_api_request_as_{$blog_or_user}" );
+
+ $response = call_user_func( $callback, $path, 'v2', array( 'method' => 'GET' ), null, 'wpcom' );
if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
// TODO log error.
@@ -262,9 +281,12 @@ public static function get_connections( $run_tests = false ) {
public function get_items( $request ) {
$items = array();
- $run_tests = $request->get_param( 'test_connections' );
+ // On Jetpack, we don't want to pass the 'scope' param to get_connections().
+ $args = array(
+ 'test_connections' => $request->get_param( 'test_connections' ),
+ );
- foreach ( self::get_connections( $run_tests ) as $item ) {
+ foreach ( self::get_connections( $args ) as $item ) {
$data = $this->prepare_item_for_response( $item, $request );
$items[] = $this->prepare_response_for_collection( $data );
From 359e9293b6ff79859716f7e8b559f618fe2fef2d Mon Sep 17 00:00:00 2001
From: Karen Attfield
Date: Thu, 9 Jan 2025 08:38:55 +0000
Subject: [PATCH 09/99] Testimonials: Ensure we avoid a division by zero error
if the columns attribute is set to 0 (#40896)
---
.../changelog/fix-testimonials-module-by-zero-error | 4 ++++
.../src/custom-post-types/class-jetpack-testimonial.php | 5 +++++
.../changelog/fix-testimonials-module-by-zero-error | 4 ++++
.../jetpack/changelog/fix-testimonials-module-by-zero-error | 4 ++++
.../changelog/fix-testimonials-module-by-zero-error | 4 ++++
.../wpcomsh/changelog/fix-testimonials-module-by-zero-error | 4 ++++
6 files changed, 25 insertions(+)
create mode 100644 projects/packages/classic-theme-helper/changelog/fix-testimonials-module-by-zero-error
create mode 100644 projects/plugins/classic-theme-helper-plugin/changelog/fix-testimonials-module-by-zero-error
create mode 100644 projects/plugins/jetpack/changelog/fix-testimonials-module-by-zero-error
create mode 100644 projects/plugins/mu-wpcom-plugin/changelog/fix-testimonials-module-by-zero-error
create mode 100644 projects/plugins/wpcomsh/changelog/fix-testimonials-module-by-zero-error
diff --git a/projects/packages/classic-theme-helper/changelog/fix-testimonials-module-by-zero-error b/projects/packages/classic-theme-helper/changelog/fix-testimonials-module-by-zero-error
new file mode 100644
index 0000000000000..cfcf858702e8b
--- /dev/null
+++ b/projects/packages/classic-theme-helper/changelog/fix-testimonials-module-by-zero-error
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Testimonials: fix a shortcode related bug which ccurs if the column attribute is added and set to 0
diff --git a/projects/packages/classic-theme-helper/src/custom-post-types/class-jetpack-testimonial.php b/projects/packages/classic-theme-helper/src/custom-post-types/class-jetpack-testimonial.php
index f223d561feeee..60dc7c16571a3 100644
--- a/projects/packages/classic-theme-helper/src/custom-post-types/class-jetpack-testimonial.php
+++ b/projects/packages/classic-theme-helper/src/custom-post-types/class-jetpack-testimonial.php
@@ -827,6 +827,11 @@ private static function get_testimonial_class( $testimonial_index_number, $colum
}
}
+ // Add a guard clause to prevent division by zero below.
+ if ( $columns <= 0 ) {
+ $columns = 1;
+ }
+
// add first and last classes to first and last items in a row
if ( ( $testimonial_index_number % $columns ) === 0 ) {
$class[] = 'testimonial-entry-first-item-row';
diff --git a/projects/plugins/classic-theme-helper-plugin/changelog/fix-testimonials-module-by-zero-error b/projects/plugins/classic-theme-helper-plugin/changelog/fix-testimonials-module-by-zero-error
new file mode 100644
index 0000000000000..cfcf858702e8b
--- /dev/null
+++ b/projects/plugins/classic-theme-helper-plugin/changelog/fix-testimonials-module-by-zero-error
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Testimonials: fix a shortcode related bug which ccurs if the column attribute is added and set to 0
diff --git a/projects/plugins/jetpack/changelog/fix-testimonials-module-by-zero-error b/projects/plugins/jetpack/changelog/fix-testimonials-module-by-zero-error
new file mode 100644
index 0000000000000..02e4047333bba
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-testimonials-module-by-zero-error
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Testimonials: fix a shortcode related bug which ccurs if the column attribute is added and set to 0
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/fix-testimonials-module-by-zero-error b/projects/plugins/mu-wpcom-plugin/changelog/fix-testimonials-module-by-zero-error
new file mode 100644
index 0000000000000..cfcf858702e8b
--- /dev/null
+++ b/projects/plugins/mu-wpcom-plugin/changelog/fix-testimonials-module-by-zero-error
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Testimonials: fix a shortcode related bug which ccurs if the column attribute is added and set to 0
diff --git a/projects/plugins/wpcomsh/changelog/fix-testimonials-module-by-zero-error b/projects/plugins/wpcomsh/changelog/fix-testimonials-module-by-zero-error
new file mode 100644
index 0000000000000..cfcf858702e8b
--- /dev/null
+++ b/projects/plugins/wpcomsh/changelog/fix-testimonials-module-by-zero-error
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Testimonials: fix a shortcode related bug which ccurs if the column attribute is added and set to 0
From 83ca14901d61ddd99f8264a832ea432dd876f48b Mon Sep 17 00:00:00 2001
From: Karen Attfield
Date: Thu, 9 Jan 2025 08:41:47 +0000
Subject: [PATCH 10/99] Tiled Gallery: Ensure container enclosing image is
selectable (#40779)
---
.../fix-tiled-gallery-image-controls | 4 +++
.../tiled-gallery/gallery-image/edit.js | 34 ++++++++-----------
2 files changed, 19 insertions(+), 19 deletions(-)
create mode 100644 projects/plugins/jetpack/changelog/fix-tiled-gallery-image-controls
diff --git a/projects/plugins/jetpack/changelog/fix-tiled-gallery-image-controls b/projects/plugins/jetpack/changelog/fix-tiled-gallery-image-controls
new file mode 100644
index 0000000000000..2715285d608b0
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-tiled-gallery-image-controls
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Tiled Gallery block: ensure movement and close icons are visible when selecting image in editor, by changing focusable element.
diff --git a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/gallery-image/edit.js b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/gallery-image/edit.js
index a409b2799e439..84ed896b32f2f 100644
--- a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/gallery-image/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/gallery-image/edit.js
@@ -17,13 +17,12 @@ class GalleryImageEdit extends Component {
};
onImageKeyDown = event => {
- if (
- this.img.current &&
- this.img.current === this.img.current.ownerDocument.activeElement &&
- this.props.isSelected &&
- [ BACKSPACE, DELETE ].includes( event.keyCode )
- ) {
- this.props.onRemove();
+ const { isSelected, onRemove } = this.props;
+
+ // Check for BACKSPACE or DELETE key presses
+ if ( isSelected && [ BACKSPACE, DELETE ].includes( event.keyCode ) ) {
+ event.preventDefault();
+ onRemove();
}
};
@@ -92,39 +91,36 @@ class GalleryImageEdit extends Component {
const isTransient = isBlobURL( origUrl );
const img = (
- // Disable reason: Image itself is not meant to be interactive, but should
- // direct image selection and unfocus caption fields.
- /* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
{ isTransient &&
- /* eslint-enable jsx-a11y/no-noninteractive-element-interactions */
);
- // Disable reason: Each block can be selected by clicking on it and we should keep the same saved markup
return (
-
{ showMovers && (
+ { href ? : img }
+
);
}
}
From f169f03940879656ae9d767cf1dfce6edd7015af Mon Sep 17 00:00:00 2001
From: Miguel Torres <1233880+mmtr@users.noreply.github.com>
Date: Thu, 9 Jan 2025 10:53:34 +0100
Subject: [PATCH 11/99] Pages: Add quick actions to change the homepage and the
posts page (#40699)
In order to remove the Pages screen from Calypso, we need to port some missing features to WP Admin first.
One of these features is the ability to change the homepage and the posts page directly from the pages list. This commit implements it in WP Admin as quick actions displayed in the pages list.
---
...remove-duplicate-views-pages-quick-actions | 4 +
.../src/class-jetpack-mu-wpcom.php | 1 +
.../src/features/pages/pages.php | 3 +
.../src/features/pages/quick-actions.php | 178 ++++++++++++++++++
4 files changed, 186 insertions(+)
create mode 100644 projects/packages/jetpack-mu-wpcom/changelog/update-remove-duplicate-views-pages-quick-actions
create mode 100644 projects/packages/jetpack-mu-wpcom/src/features/pages/pages.php
create mode 100644 projects/packages/jetpack-mu-wpcom/src/features/pages/quick-actions.php
diff --git a/projects/packages/jetpack-mu-wpcom/changelog/update-remove-duplicate-views-pages-quick-actions b/projects/packages/jetpack-mu-wpcom/changelog/update-remove-duplicate-views-pages-quick-actions
new file mode 100644
index 0000000000000..f7863e4d48100
--- /dev/null
+++ b/projects/packages/jetpack-mu-wpcom/changelog/update-remove-duplicate-views-pages-quick-actions
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Pages: Add quick actions to change the homepage and the posts page
diff --git a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php
index 5bbc4ad0e9d6c..8234c0d13aa7e 100644
--- a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php
+++ b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php
@@ -143,6 +143,7 @@ public static function load_wpcom_user_features() {
if ( ! class_exists( 'A8C\FSE\Help_Center' ) ) {
require_once __DIR__ . '/features/help-center/class-help-center.php';
}
+ require_once __DIR__ . '/features/pages/pages.php';
require_once __DIR__ . '/features/replace-site-visibility/replace-site-visibility.php';
require_once __DIR__ . '/features/wpcom-admin-bar/wpcom-admin-bar.php';
require_once __DIR__ . '/features/wpcom-admin-interface/wpcom-admin-interface.php';
diff --git a/projects/packages/jetpack-mu-wpcom/src/features/pages/pages.php b/projects/packages/jetpack-mu-wpcom/src/features/pages/pages.php
new file mode 100644
index 0000000000000..7f51bb4bb27d8
--- /dev/null
+++ b/projects/packages/jetpack-mu-wpcom/src/features/pages/pages.php
@@ -0,0 +1,3 @@
+post_status !== 'publish' ) {
+ return $actions;
+ }
+
+ $homepage_id = (int) get_option( 'page_on_front' );
+ $posts_page_id = (int) get_option( 'page_for_posts' );
+ $has_static_homepage = 'page' === get_option( 'show_on_front' ) && (bool) $homepage_id;
+ $is_homepage = $page->ID === $homepage_id;
+ $is_posts_page = $page->ID === $posts_page_id;
+
+ if ( ! $has_static_homepage || $is_homepage ) {
+ return $actions;
+ }
+
+ $set_homepage_action = 'set-homepage';
+ $set_posts_page_action = 'set-posts-page';
+
+ $cleaned_current_url = remove_query_arg( array( $set_homepage_action, $set_posts_page_action, '_wpnonce' ) );
+
+ $set_homepage_link = add_query_arg( $set_homepage_action, $page->ID, $cleaned_current_url );
+ $set_homepage_link = wp_nonce_url( $set_homepage_link, $set_homepage_action . '_' . $page->ID );
+
+ $actions[ $set_homepage_action ] = sprintf(
+ '%3$s',
+ esc_url( $set_homepage_link ),
+ /* translators: page title */
+ esc_attr( sprintf( __( 'Set “%s” as your site\'s homepage', 'jetpack-mu-wpcom' ), $page->post_title ) ),
+ esc_html( __( 'Set as homepage', 'jetpack-mu-wpcom' ) )
+ );
+
+ $new_posts_page = $is_posts_page ? 0 : $page->ID;
+
+ $set_posts_page_link = add_query_arg( $set_posts_page_action, $new_posts_page, $cleaned_current_url );
+ $set_posts_page_link = wp_nonce_url( $set_posts_page_link, $set_posts_page_action . '_' . $new_posts_page );
+ /* translators: page title */
+ $set_posts_page_label = $is_posts_page ? sprintf( __( 'Unset “%s” as the page that displays your latest posts', 'jetpack-mu-wpcom' ), $page->post_title ) : sprintf( __( 'Set “%s” as the page that displays your latest posts', 'jetpack-mu-wpcom' ), $page->post_title );
+ $set_posts_page_text = $is_posts_page ? __( 'Unset as posts page', 'jetpack-mu-wpcom' ) : __( 'Set as posts page', 'jetpack-mu-wpcom' );
+
+ $actions[ $set_posts_page_action ] = sprintf(
+ '%3$s',
+ esc_url( $set_posts_page_link ),
+ esc_attr( $set_posts_page_label ),
+ esc_html( $set_posts_page_text )
+ );
+
+ return $actions;
+}
+add_filter( 'page_row_actions', 'wpcom_page_quick_actions', 10, 2 );
+
+/**
+ * Checks if the current request can perform a quick action valid for a given page.
+ *
+ * @param string $action Action name ('set-homepage', 'set-posts-page').
+ *
+ * @return false|int The page ID is the request is valid, false otherwise.
+ */
+function wpcom_validate_quick_action( $action ) {
+ global $pagenow;
+
+ if ( 'edit.php' !== $pagenow ) {
+ return false;
+ }
+
+ if ( ! isset( $_GET['post_type'] ) || 'page' !== sanitize_text_field( wp_unslash( $_GET['post_type'] ) ) ) {
+ return false;
+ }
+
+ if ( ! current_user_can( 'manage_options' ) ) {
+ return false;
+ }
+
+ if ( ! isset( $_GET[ $action ] ) ) {
+ return false;
+ }
+
+ $page_id = sanitize_text_field( wp_unslash( $_GET[ $action ] ) );
+ if ( ! is_numeric( $page_id ) ) {
+ return false;
+ }
+
+ check_admin_referer( $action . '_' . $page_id );
+
+ $homepage_id = (int) get_option( 'page_on_front' );
+ $has_static_homepage = 'page' === get_option( 'show_on_front' ) && (bool) $homepage_id;
+
+ if ( ! $has_static_homepage ) {
+ return false;
+ }
+
+ $page_id = (int) $page_id;
+
+ if ( $action === 'set-posts-page' && $page_id === 0 ) {
+ return $page_id;
+ }
+
+ if ( $page_id === $homepage_id ) {
+ return false;
+ }
+
+ $page = get_post( $page_id );
+ if ( ! ( $page instanceof WP_Post ) || $page->post_type !== 'page' || $page->post_status !== 'publish' ) {
+ return false;
+ }
+
+ return $page_id;
+}
+
+/**
+ * Changes the homepage.
+ */
+function wpcom_set_homepage() {
+ $new_homepage_id = wpcom_validate_quick_action( 'set-homepage' );
+ if ( ! is_int( $new_homepage_id ) ) {
+ return;
+ }
+
+ update_option( 'page_on_front', $new_homepage_id );
+
+ add_action(
+ 'admin_notices',
+ function () {
+ wp_admin_notice(
+ __( 'Homepage changed successfully.', 'jetpack-mu-wpcom' ),
+ array(
+ 'type' => 'success',
+ 'dismissible' => true,
+ )
+ );
+ }
+ );
+}
+add_action( 'init', 'wpcom_set_homepage', 0 ); // Before masterbar_init_wp_posts_list
+
+/**
+ * Changes the posts_page.
+ */
+function wpcom_set_posts_page() {
+ $new_posts_page_id = wpcom_validate_quick_action( 'set-posts-page' );
+ if ( ! is_int( $new_posts_page_id ) ) {
+ return;
+ }
+
+ update_option( 'page_for_posts', $new_posts_page_id );
+
+ add_action(
+ 'admin_notices',
+ function () {
+ wp_admin_notice(
+ __( 'Posts page changed successfully.', 'jetpack-mu-wpcom' ),
+ array(
+ 'type' => 'success',
+ 'dismissible' => true,
+ )
+ );
+ }
+ );
+}
+add_action( 'init', 'wpcom_set_posts_page', 0 ); // Before masterbar_init_wp_posts_list
From 9a36c92f6fd25fe728fa828147966a02b16896b8 Mon Sep 17 00:00:00 2001
From: arthur791004
@@ -156,8 +152,8 @@ class GalleryImageEdit extends Component {
/>
{ /* Keep the HTML structure, but ensure there is no navigation from edit */ }
- { href ? { img } : img }
-
+
+
),
content: (
<>
@@ -55,7 +84,7 @@ const Notice = () => {
{ sprintf(
// translators: %s: page name
__(
- "We've switched to the standard WordPress %s view to bring you improvements that also benefit the entire WordPress community.",
+ "We've adopted WordPress's main %s view to bring improvements to you and millions of WordPress users worldwide.",
'jetpack-mu-wpcom'
),
removedCalypsoScreenNoticeConfig.title
diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-interface/screens/edit-comments-php.webp b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-interface/screens/edit-comments-php.webp
deleted file mode 100644
index e552a79e58657b638802281af1686b29b1857485..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 64250
zcmaHS1z6l_)Ar)-UZA+UyF0~Qin}|-7k8()yBC)N#jQAn;_mKl`_tFX`Rq@wB$LT(
z^2o?NldOu2q~z5T0H7%$s-&UBtpyJN0EpkWFHis?2!M>3n9?xV`zZiy_|G1a833@e
zcXd{g5+&Bs)**)30D!%(|5%JnTpa&N{jd9Xsk^y<%FZzSuM+=%CY-66i^;pl#rsC?
z{QmIwHetTgm=^z}ssGT%|D^f<&|h2~UEgJt{?N{9Dq`=n={rqr@i*G|Z?uV{^B?)>
zcNu;=Tem;Y`m_A$9io}Ny6XE8_I)D&xByfDQUK9E{eM4yUmOYm0Pb4=03!Y`o^d(=
z&=LXw;4b~eBhLc>P=Wz~=E=W!e~pQwk+ac1ZU_0k2RAnd0Io^_03>Yy0AmUOfY<%U
zwfEis(Kh1uO9b!ja(G`Y0JZ=#05L!YU=J_>Fuqf)0A>ISfb)HZi6I{W08|u+Y%p36
zC}Idf7ThRtQj&Z$?cjJ~2*`#OKSCp68wUx&NCV<)>e;MiKhSgT$r?N>sIbfE4dx~8
zmFYtNmcM;@|2q)k8Rq$ZV*kpU