From afcecb37c400615557862a4773cea528b9d9c6b9 Mon Sep 17 00:00:00 2001 From: Mikael Korpela Date: Tue, 19 Aug 2025 11:41:35 +0300 Subject: [PATCH 1/4] Add activity log module --- changelog/add-activity-log-module | 5 ++++ .../wpcom-admin-menu/wpcom-admin-menu.php | 20 +++++++++------- .../my-jetpack/src/class-activitylog.php | 5 ++++ .../plugins/jetpack/modules/activity-log.php | 24 +++++++++++++++++++ .../plugins/jetpack/modules/module-info.php | 16 +++++++++++++ 5 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 changelog/add-activity-log-module create mode 100644 projects/plugins/jetpack/modules/activity-log.php diff --git a/changelog/add-activity-log-module b/changelog/add-activity-log-module new file mode 100644 index 0000000000000..feca4042843ee --- /dev/null +++ b/changelog/add-activity-log-module @@ -0,0 +1,5 @@ +Significance: minor +Type: added + +Modules: add new "Activity Log" module entry, enabling management and discovery from the Jetpack modules screen. + diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php index 463b058832955..82ea70ab8c74e 100644 --- a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php +++ b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-menu/wpcom-admin-menu.php @@ -373,15 +373,17 @@ function () { } // Jetpack > Activity Log. - wpcom_hide_submenu_page( 'jetpack', esc_url( Redirect::get_url( 'cloud-activity-log-wp-menu', array( 'site' => $blog_id ) ) ) ); - add_submenu_page( - 'jetpack', - __( 'Activity Log', 'jetpack-mu-wpcom' ), - __( 'Activity Log', 'jetpack-mu-wpcom' ), - 'manage_options', - 'https://wordpress.com/activity-log/' . $domain, - null // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539. - ); + if ( class_exists( '\\Jetpack' ) && \Jetpack::is_module_active( 'activity-log' ) ) { + wpcom_hide_submenu_page( 'jetpack', esc_url( Redirect::get_url( 'cloud-activity-log-wp-menu', array( 'site' => $blog_id ) ) ) ); + add_submenu_page( + 'jetpack', + __( 'Activity Log', 'jetpack-mu-wpcom' ), + __( 'Activity Log', 'jetpack-mu-wpcom' ), + 'manage_options', + 'https://wordpress.com/activity-log/' . $domain, + null // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539. + ); + } wpcom_reorder_submenu( 'jetpack', diff --git a/projects/packages/my-jetpack/src/class-activitylog.php b/projects/packages/my-jetpack/src/class-activitylog.php index 4de90c075ded5..54bfae9bbdaa4 100644 --- a/projects/packages/my-jetpack/src/class-activitylog.php +++ b/projects/packages/my-jetpack/src/class-activitylog.php @@ -38,6 +38,11 @@ public static function add_submenu_jetpack() { return; } + // Only display if the Activity Log module is active. + if ( ! ( class_exists( '\\Jetpack' ) && \Jetpack::is_module_active( 'activity-log' ) ) ) { + return; + } + $args = array(); $blog_id = Connection_Manager::get_site_id( true ); diff --git a/projects/plugins/jetpack/modules/activity-log.php b/projects/plugins/jetpack/modules/activity-log.php new file mode 100644 index 0000000000000..055a0ead6ca8f --- /dev/null +++ b/projects/plugins/jetpack/modules/activity-log.php @@ -0,0 +1,24 @@ + Date: Tue, 19 Aug 2025 11:43:22 +0300 Subject: [PATCH 2/4] changelogs --- .../jetpack-mu-wpcom/changelog/update-add-activity-log-module | 4 ++++ .../my-jetpack/changelog/update-add-activity-log-module | 4 ++++ .../plugins/jetpack/changelog/update-add-activity-log-module | 4 ++++ 3 files changed, 12 insertions(+) create mode 100644 projects/packages/jetpack-mu-wpcom/changelog/update-add-activity-log-module create mode 100644 projects/packages/my-jetpack/changelog/update-add-activity-log-module create mode 100644 projects/plugins/jetpack/changelog/update-add-activity-log-module diff --git a/projects/packages/jetpack-mu-wpcom/changelog/update-add-activity-log-module b/projects/packages/jetpack-mu-wpcom/changelog/update-add-activity-log-module new file mode 100644 index 0000000000000..e0743627f37dd --- /dev/null +++ b/projects/packages/jetpack-mu-wpcom/changelog/update-add-activity-log-module @@ -0,0 +1,4 @@ +Significance: minor +Type: added + +Modules: add new "Activity Log" module entry, enabling management and discovery from the Jetpack modules screen. diff --git a/projects/packages/my-jetpack/changelog/update-add-activity-log-module b/projects/packages/my-jetpack/changelog/update-add-activity-log-module new file mode 100644 index 0000000000000..e0743627f37dd --- /dev/null +++ b/projects/packages/my-jetpack/changelog/update-add-activity-log-module @@ -0,0 +1,4 @@ +Significance: minor +Type: added + +Modules: add new "Activity Log" module entry, enabling management and discovery from the Jetpack modules screen. diff --git a/projects/plugins/jetpack/changelog/update-add-activity-log-module b/projects/plugins/jetpack/changelog/update-add-activity-log-module new file mode 100644 index 0000000000000..1d04ad41977a0 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-add-activity-log-module @@ -0,0 +1,4 @@ +Significance: minor +Type: enhancement + +Modules: add new "Activity Log" module entry, enabling management and discovery from the Jetpack modules screen. From 1d1c56c162888e24e54c037fc11f59fdc1027e5c Mon Sep 17 00:00:00 2001 From: Mikael Korpela Date: Tue, 19 Aug 2025 11:57:56 +0300 Subject: [PATCH 3/4] My Jetpack grouping --- .../_inc/components/my-jetpack-tab-panel/products/constants.ts | 1 + .../_inc/components/my-jetpack-tab-panel/products/mappings.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/projects/packages/my-jetpack/_inc/components/my-jetpack-tab-panel/products/constants.ts b/projects/packages/my-jetpack/_inc/components/my-jetpack-tab-panel/products/constants.ts index 63cf5f24206c6..e79a7d9f313ba 100644 --- a/projects/packages/my-jetpack/_inc/components/my-jetpack-tab-panel/products/constants.ts +++ b/projects/packages/my-jetpack/_inc/components/my-jetpack-tab-panel/products/constants.ts @@ -41,6 +41,7 @@ export const PRODUCTS_MUST_HAVE_A_STANDALONE_PLUGIN = [ 'anti-spam', 'boost', 'c */ export const JETPACK_NON_PAID_MODULES = [ 'account-protection', + 'activity-log', 'blaze', 'blocks', 'carousel', diff --git a/projects/packages/my-jetpack/_inc/components/my-jetpack-tab-panel/products/mappings.ts b/projects/packages/my-jetpack/_inc/components/my-jetpack-tab-panel/products/mappings.ts index 1b9c2b4be500e..7a14073dec8c4 100644 --- a/projects/packages/my-jetpack/_inc/components/my-jetpack-tab-panel/products/mappings.ts +++ b/projects/packages/my-jetpack/_inc/components/my-jetpack-tab-panel/products/mappings.ts @@ -22,6 +22,7 @@ export const CATEGORY_CARDS_AND_MODULES: { modules: [ // No prettier please 'account-protection', + 'activity-log', 'monitor', 'notes', 'sso', From ee5f715c59cd3e17dce89a8aee7908886f900362 Mon Sep 17 00:00:00 2001 From: Mikael Korpela Date: Tue, 19 Aug 2025 11:59:02 +0300 Subject: [PATCH 4/4] Auto activate AL module --- projects/plugins/jetpack/modules/activity-log.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/plugins/jetpack/modules/activity-log.php b/projects/plugins/jetpack/modules/activity-log.php index 055a0ead6ca8f..48f0601e2ed2d 100644 --- a/projects/plugins/jetpack/modules/activity-log.php +++ b/projects/plugins/jetpack/modules/activity-log.php @@ -13,7 +13,7 @@ First Introduced: $$next-version$$ Requires Connection: Yes Requires User Connection: Yes -Auto Activate: No +Auto Activate: Yes Module Tags: Recommended Feature: Security Additional Search Queries: activity, log, audit, events, changes, history