Skip to content

Commit

Permalink
Update/action button to be reusable (#41361)
Browse files Browse the repository at this point in the history
* Add redbubble and notice when paid plan is missing plugin(s).

* Add activate-multiple-plugins endpoint & logic.

* Delay last-backup-failed red-bubble until 30 min after purchase. Also fix $not_shown_products.

* Refactor how we derive shown_products & not_shown_products.

* Cleanup & add GlobalNotice after successfull activation/installation.

* Remove single product endpoints from mj REST_Products.

* First commit

* Move logic to action button component

* changelog

* Fix status loading indicator

* Get rid of outdated comments

* Remove unnecessary array slug

* Fix accidental duplicate functions

* Remove duplicate

* Fix warnings

* Remove duplicate endpoint

* Remove log

* Update phan

---------

Co-authored-by: Bryan Elliott <bryan@elliottprogrammer.com>

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/13042692163

Upstream-Ref: Automattic/jetpack@0818fd2
  • Loading branch information
CodeyGuyDylan authored and matticbot committed Jan 30, 2025
1 parent d549e9f commit 49cece5
Showing 10 changed files with 179 additions and 178 deletions.
1 change: 1 addition & 0 deletions jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@ This is an alpha version! The changes listed here are not final.
- My Jetpack: Add red bubble and notice when pain plan is missing plugin.

### Changed
- Make Action Button component more reusable
- Updated package dependencies.
- Updating My Jetpack interstitial modal with new styles and layout.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-dom', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'ac994e8edce93a330553');
<?php return array('dependencies' => array('jetpack-connection', 'jetpack-script-data', 'react', 'react-dom', 'react-jsx-runtime', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'f9de2142837259dab06d');

Large diffs are not rendered by default.

148 changes: 74 additions & 74 deletions jetpack_vendor/automattic/jetpack-my-jetpack/build/index.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -239,7 +239,7 @@ public static function edit_permissions_callback() {
* Callback for activating products
*
* @param \WP_REST_Request $request The request object.
* @return \WP_REST_Response
* @return \WP_REST_Response|\WP_Error
*/
public static function activate_products( $request ) {
$products_array = $request->get_param( 'products' );
@@ -273,7 +273,7 @@ public static function activate_products( $request ) {
* Callback for deactivating products
*
* @param \WP_REST_Request $request The request object.
* @return \WP_REST_Response
* @return \WP_REST_Response|\WP_Error
*/
public static function deactivate_products( $request ) {
$products_array = $request->get_param( 'products' );
@@ -306,7 +306,7 @@ public static function deactivate_products( $request ) {
* Callback for installing (and activating) multiple product plugins.
*
* @param \WP_REST_Request $request The request object.
* @return \WP_REST_Response
* @return \WP_REST_Response|\WP_Error
*/
public static function install_plugins( $request ) {
$products_array = $request->get_param( 'products' );
2 changes: 1 addition & 1 deletion jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '5.4.1-alpha1738107648',
'ver' => '5.4.1-alpha1738194788',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
62 changes: 31 additions & 31 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
"reference": "92367ff0a35aa37b685b0f86ea5468605d663983"
"reference": "65638499b293c8e08c52811c28156bc308531f64"
},
"require": {
"php": ">=7.2"
@@ -63,7 +63,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "54a83068fa84e440f164e95f1621692db081d3f1"
"reference": "284d6e26eb7f46ba55ddf3dccd0770206945c0d5"
},
"require": {
"php": ">=7.2"
@@ -131,7 +131,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "795023db9e47f633b808fbc44738abf9916caffc"
"reference": "3d1e18f894b3b89ff6a9bf6391d787bf7e84d824"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
@@ -203,7 +203,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "ca9671c0f93d12e5685d8cd71ed437dca1986ff7"
"reference": "366d898424bf04ad9e51f9369eb017d54bd80df5"
},
"require": {
"composer-plugin-api": "^2.2",
@@ -274,7 +274,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-backup-helper-script-manager",
"reference": "50b5eceb4c4eac95dfa2d42aa5c942f4f288a918"
"reference": "9e1d20af8cc7aa8742dc6f43a77ef68f4cd4ce5f"
},
"require": {
"php": ">=7.2"
@@ -337,7 +337,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
"reference": "ac818fbd09f7c0d9d068c319078368e8bb0e6bab"
"reference": "1edba64f97c046045903c0ac08c08e63fad76355"
},
"require": {
"automattic/jetpack-connection": "^6.3.2-alpha",
@@ -395,7 +395,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
"reference": "43e3810c45d9b6b2041e16b5b4654436bc5a5209"
"reference": "0f5b2522caa4ab1249bd75a8c3bb877bac677c3e"
},
"require": {
"automattic/jetpack-boost-core": "^0.3.4",
@@ -462,7 +462,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "3c03c9a8818b077807d2e152900d5822bf892d67"
"reference": "93754cf9afd41ce5ce7c8c592386fda46f5213de"
},
"require": {
"composer-plugin-api": "^2.2",
@@ -525,7 +525,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "dd6849e26daf39a8f0c7bef78d0dbb46f18c7661"
"reference": "ecbc187d2aeb0400d1f3f0ce4bf6f99393b40952"
},
"require": {
"php": ">=7.2"
@@ -600,7 +600,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "c96e3110dd3852d79c25a284ea035be5bd131215"
"reference": "9f142e756e718581111c8b1e3381edb4af1f17c9"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -693,7 +693,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "2983e1c4dc232b0fab64736ae5aad964ca380aed"
"reference": "166d3846c8c4b22a79e3007a27e370ec1e5dbf1d"
},
"require": {
"php": ">=7.2"
@@ -750,7 +750,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "a6b06748655e30aee18e0a27228922e62a404b5c"
"reference": "8ec297aa5953f76fcbcfd987215fb0c3ab2fe53f"
},
"require": {
"php": ">=7.2"
@@ -806,7 +806,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
"reference": "d0f26e5cfaea16ae3d22fd5216b3fb140bac862c"
"reference": "a4dd086ccb6f83ea16666f79fad8a52b4d925a77"
},
"require": {
"automattic/jetpack-connection": "^6.3.2-alpha",
@@ -884,7 +884,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "848be28aeb010ac44f0728af8b2c11c869897a0e"
"reference": "86c2e49c8ea7258034b30f90373e15fd6d951654"
},
"require": {
"php": ">=7.2"
@@ -945,7 +945,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "89fcb429b91fd1d366c6679b8b2d0fdec91f9fd4"
"reference": "e73ad3b5db44b225081f3eebc3dafe8b5c0ae0ff"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -1023,7 +1023,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "2753bdccdd9c41a3ead17778af84a23c98338e75"
"reference": "360f84fcfac10b165db6b8ee15a84720f30c80c1"
},
"require": {
"automattic/jetpack-connection": "^6.3.2-alpha",
@@ -1088,7 +1088,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "fb9191cee03e04bdc6b35b9d676f7b0c68a658bb"
"reference": "ecf04e6e5e736aec5540a15d6cae55bfcf318d77"
},
"require": {
"php": ">=7.2"
@@ -1139,12 +1139,12 @@
},
{
"name": "automattic/jetpack-my-jetpack",
"version": "5.4.1-alpha.1738107648",
"version_normalized": "5.4.1.0-alpha1738107648",
"version": "5.4.1-alpha.1738194788",
"version_normalized": "5.4.1.0-alpha1738194788",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "305d4c346a1b59fe5665f0b143220d18134d6d0e"
"reference": "9e1b1be126dcb1c0d5ce61519978d1b512816bb4"
},
"require": {
"automattic/jetpack-admin-ui": "^0.5.1",
@@ -1249,7 +1249,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "467d6fe75eabdc570d7b4e8f4c2221df72e5d449"
"reference": "d50ce6db30f221bbf58b7cc264e17ddd78d5f49b"
},
"require": {
"php": ">=7.2"
@@ -1313,7 +1313,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "493f0911e0075b148b5eefad9158da518d2381b1"
"reference": "92f6b5995d768654e5d57050c5a906a2b2f52970"
},
"require": {
"automattic/jetpack-connection": "^6.3.2-alpha",
@@ -1384,7 +1384,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "7492db40fb77bd113c93a056305b8edce7eabaa8"
"reference": "8c92a77e419e3509ee7f24b4e2d35b8b96cf9d85"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
@@ -1443,7 +1443,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
"reference": "5011f8baee2c58eed2e388c215ba3403f7a774a1"
"reference": "4e950f05e12fe70673f06180f1575f3f0ed8854b"
},
"require": {
"php": ">=7.2"
@@ -1516,7 +1516,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
"reference": "ed971500a0e73f50a3725eb56cdbb2d03438900b"
"reference": "a057687512bd0f37be2f6135ba243f68285edc5a"
},
"require": {
"automattic/jetpack-connection": "^6.3.2-alpha",
@@ -1594,7 +1594,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "2ae80f2d15cd5604cdb4794c97556774d405e2f2"
"reference": "771b401874db169cba76c5789348ea7da0ba33b0"
},
"require": {
"automattic/jetpack-status": "^5.0.2",
@@ -1652,7 +1652,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "3fea16ee283b9df6970e45498e622097edfa344b"
"reference": "0d5a2766336362b4adfbb74aabe7648824ed183f"
},
"require": {
"php": ">=7.2"
@@ -1709,7 +1709,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "a18ae5c5a98375c44cd98a4a708f9a1f2a864287"
"reference": "cef6742f0133884cfd3ee5173b39d88f16bc674c"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
@@ -1776,7 +1776,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "9d019de71b9384254d5ba62ba64487842d3aeb40"
"reference": "1e929065862cf9af37b5e2445e39daf7b477af7e"
},
"require": {
"automattic/jetpack-connection": "^6.3.2-alpha",
@@ -1857,7 +1857,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-transport-helper",
"reference": "ba041ca1f8fb3aa7af084b1ff284d147a9af84b8"
"reference": "30be1c769a835662a6eaf8c32b140478d845f3c2"
},
"require": {
"automattic/jetpack-backup-helper-script-manager": "^0.3.1",
@@ -1935,7 +1935,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-waf",
"reference": "5980beaaf1368ffaefd5d14eedf997578217bdf9"
"reference": "94ec07e4e16233458ed3fa71f7a764db033701c6"
},
"require": {
"automattic/jetpack-connection": "^6.3.2-alpha",
Loading

0 comments on commit 49cece5

Please sign in to comment.