Skip to content

Commit

Permalink
My Jetpack: Fix Stats card status when not connected (#33521)
Browse files Browse the repository at this point in the history
* check connection status before using parent status

* fix Stats card status when not connected

* move changelog

* redirect add stats to connection

* fix changelog

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6466070160
  • Loading branch information
kangzj authored and matticbot committed Oct 10, 2023
1 parent 0f655b6 commit 7e50f60
Show file tree
Hide file tree
Showing 7 changed files with 84 additions and 81 deletions.
3 changes: 3 additions & 0 deletions jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ This is an alpha version! The changes listed here are not final.
- Changed title of the my-jetpack page to "My Jetpack"
- Updated package dependencies.

### Fixed
- My Jetpack: fix Stats card status when not connected

## [3.8.0] - 2023-10-03
### Added
- Display a new section on My Jetpack to display the stats of the site. [#33283]
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '77691aa7691f1ca0bc61');
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => 'f5edbae74b0d38ae3804');

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '3.8.1-alpha1696887729',
'ver' => '3.8.1-alpha1696922761',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand Down
52 changes: 26 additions & 26 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
"reference": "24f69cca5b390c21bd83938976bcc2757cc73c9b"
"reference": "2a0438f133706f3bc91957ae68c918f6cf780fed"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -57,7 +57,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "6a9adc7ec90c34bd581102493b1145b1b9a7d652"
"reference": "0d7f059338bb489bae6a0480c36b2286ca9d7f3c"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -119,7 +119,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "44026c46c15c24adb96e7faeb26a0e37b33b5387"
"reference": "c5edcfa557d39a8a21fa59546f9850eb3aa7708a"
},
"require": {
"automattic/jetpack-constants": "^1.6.23"
Expand Down Expand Up @@ -187,7 +187,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "0ccc451725d9137a461ac2d4fb809240201cdf58"
"reference": "cedccb097e35465ce2c4d4e84381de25e54743d8"
},
"require": {
"composer-plugin-api": "^1.1 || ^2.0"
Expand Down Expand Up @@ -252,7 +252,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "c7193ad5ef67dcc47e8b35920563716c8ef60983"
"reference": "11b8945c25c5d0315b51427ee5f366cd60107cbf"
},
"require": {
"composer-plugin-api": "^2.1.0"
Expand Down Expand Up @@ -311,7 +311,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "d88103489b3d87f86c6c6e0a6147275b1d3d321a"
"reference": "ffb5ea2577cf02b46efcab3f33ab12d4c9f35d89"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11"
Expand Down Expand Up @@ -353,7 +353,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "c1ce0a510170d754d7172af835b54bd23bb1582d"
"reference": "dcbcf39c7fb622bd9cb815cb97bc4f9f1453831d"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.22",
Expand Down Expand Up @@ -431,7 +431,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "99eaf4bcae16e77271041805c0ff67777e77ba3e"
"reference": "6c50bf030708b4b0a55a0f9c623ad089d951d260"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -482,7 +482,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "07b8d1bf346f310a71a35c14fea2abdbeff8a34e"
"reference": "406d9088fdafc0eb4eef77a38ca1bc2fa7c8059e"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -532,7 +532,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-identity-crisis",
"reference": "8eb8ffdb5aa851a064182268530e2ea1448a1d27"
"reference": "e957b5c7c2c9a4ac0cbe0d9a66f09573e7374334"
},
"require": {
"automattic/jetpack-assets": "^1.18.12-alpha",
Expand Down Expand Up @@ -610,7 +610,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "e9e9f88c2e47aeb8ebcbdeea44dd5dc08bcdb5fd"
"reference": "2a28ef0c4f6a22583d32a4b929215ec9035df9bd"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -665,7 +665,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "340c44fb5d0174c4ebaeaa6761fa559aacc62160"
"reference": "4437cf29eeb9ab64fc9162723a0138c9821b1f03"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.22",
Expand Down Expand Up @@ -740,7 +740,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "300f9009618468e9dfd3df2fe3d9650e5b0ef46d"
"reference": "ade6c1a8cecc8cee5d51ca8ea163503cb4972495"
},
"require": {
"automattic/jetpack-connection": "^1.58.1-alpha"
Expand Down Expand Up @@ -801,7 +801,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "e5d18b66327220338517df2551a04849a7b33dcb"
"reference": "e32a5b01d7b8343b00151bbfec5fed5352ed658f"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -846,12 +846,12 @@
},
{
"name": "automattic/jetpack-my-jetpack",
"version": "3.8.1-alpha.1696887729",
"version_normalized": "3.8.1.0-alpha1696887729",
"version": "3.8.1-alpha.1696922761",
"version_normalized": "3.8.1.0-alpha1696922761",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "b01ebfb79452147fe45d9209218ad26c7068ece1"
"reference": "d5d69b45df24c04dc78aa831f116cb74926d55da"
},
"require": {
"automattic/jetpack-admin-ui": "^0.2.23",
Expand Down Expand Up @@ -941,7 +941,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-partner",
"reference": "fb6c3fda8337ed97fa1bb163d579e006a09d9567"
"reference": "823a4c7a9bc27d75dc5c2c9a83013fa4007d944f"
},
"require": {
"automattic/jetpack-connection": "^1.58.1-alpha",
Expand Down Expand Up @@ -1003,7 +1003,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "95770a61ef402fe730de0b7f58a8dd5ccbd72973"
"reference": "c2594217a40eca5d2598e2b006d2002602b4c30f"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -1061,7 +1061,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "9a1742881a8b3b791ec899be01c0e4e59953e2c7"
"reference": "af891c09d51cf842b271b22b439331a683a28446"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.22"
Expand Down Expand Up @@ -1115,7 +1115,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "8316df0c56f7a9242a0b4002eaba0aaeb6558306"
"reference": "f6576fa76ca19e2b55c55aa87064039c9a71227c"
},
"require": {
"automattic/jetpack-status": "^1.18.5"
Expand Down Expand Up @@ -1169,7 +1169,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "2f0dfd25e0ef0bce3c3a17cb68cca6d0380c43b3"
"reference": "70e4c1c8f0570356544db129b2c70ebb52ff6b06"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -1220,7 +1220,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-search",
"reference": "34cec3b2e4dfe67bd95beb6fda2f9b9277552d4c"
"reference": "9b220a971c83fb9dd271455f330dd65cd1811b90"
},
"require": {
"automattic/jetpack-assets": "^1.18.12-alpha",
Expand Down Expand Up @@ -1306,7 +1306,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-stats",
"reference": "f9d37570d1a07cf92c907a4e361030d0054e3af1"
"reference": "a98784c94a40af55d565d89ddc22a529dd655a95"
},
"require": {
"automattic/jetpack-assets": "^1.18.12-alpha",
Expand Down Expand Up @@ -1370,7 +1370,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "75f28c7a5b99e8afa7f1ea8cecc92a1410ed7e85"
"reference": "97c3dda681e19e5fd37c226b0c732c16e68342d0"
},
"require": {
"automattic/jetpack-constants": "^1.6.23"
Expand Down Expand Up @@ -1425,7 +1425,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "1770d85e0a4bfa1d16a162c5662065f9f85e6ffe"
"reference": "7f27c61f94fe2ea84d2de7f2acf2955ef92e6c3c"
},
"require": {
"automattic/jetpack-connection": "^1.58.1-alpha",
Expand Down
Loading

0 comments on commit 7e50f60

Please sign in to comment.