Skip to content

Commit

Permalink
Social | Hide irrelevant UI on social admin page (#41393)
Browse files Browse the repository at this point in the history
* Hide Social Notes if Social plugin is not active

* Hide connection screen and pricing page for WPCOM

* Hide upgrade nudge for WPCOM

* Add safe fallbacks for settings selectors for WPCOM

* Hide shares data on WPCOM

* Hide plugin footer on WPCOM

* Hide license notice for WPCOM

* Hide publicize toggle on WPCOM

* Hide UTM toggle for now on WPCOM

* Revert "Hide UTM toggle for now on WPCOM"

This reverts commit c88feecbe69c6310b4a1ebc8caa514c86c7cec8f.

Settings API is fixed in #41420

* Fix unit tests

* Adjust the WPCOM test and display of the toggle section.

* Adjust styling and fix selector name.

* Add dummy arg to avoid optimisation problems.

* Create our helper function

* Hide everything that's not self hosted

* Move util to script data package

* changelog

* Clean up function

* Use function in admin page

* Update support doc link and general publicize help link

* Fix selector to check that the module is active.

* Swap to using _x rather than a dummy arg to fix the optimisation

---------

Co-authored-by: Paul Bunkham <[email protected]>
Co-authored-by: Gergely Juhasz <[email protected]>

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

Upstream-Ref: Automattic/jetpack@407829a
  • Loading branch information
pablinos authored and matticbot committed Feb 10, 2025
1 parent a114d58 commit e6ba380
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 54 deletions.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array(), 'version' => '3d6b6c0a2cee025f46f3');
<?php return array('dependencies' => array(), 'version' => 'fa56169a364243ed8d42');

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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": "1713f635a52d99a641c9e70f8641336c16fd09ab"
"reference": "5abd0e9439d68fdaeca9f4097caa2904a08b82bf"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -63,7 +63,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "4190de06ec4b4b15fe016a8c1d34e4b6f6d0eeed"
"reference": "1d1ca305eb1f400074453a8d2fa7d599e9207f45"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -125,7 +125,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "5f0b9de732e7aaeb7f3e9529ee6f50d9cebcb605"
"reference": "ffd5c05eca3cdd1b4706b42f99df376cc8e72ebf"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
Expand Down Expand Up @@ -197,7 +197,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "20192c03c942b091f70c84cce444c09660fb99ff"
"reference": "ec97ee8d5500e4b85ac3587329c38f70655eb0e9"
},
"require": {
"composer-plugin-api": "^2.2",
Expand Down Expand Up @@ -268,7 +268,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
"reference": "da7a99c129301e1092259506b0a2e66157b34e0d"
"reference": "c366deaf5c6c82bfacd5f53f5c1fa164c54d42a6"
},
"require": {
"automattic/jetpack-connection": "^6.4.0-alpha",
Expand Down Expand Up @@ -326,7 +326,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
"reference": "a90178105753a523ef6d2fb876c608ce37c93360"
"reference": "fbe7fd46d4d761a0138c5527ca3fd94f9690ac1c"
},
"require": {
"automattic/jetpack-boost-core": "^0.3.5",
Expand Down Expand Up @@ -393,7 +393,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "111ecd018f0c86226176380c6f437ed1d47de5a8"
"reference": "ede5579f4c7218197d6cb8da9b10df131c1b5ddf"
},
"require": {
"composer-plugin-api": "^2.2",
Expand Down Expand Up @@ -456,7 +456,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "365b2e12ecf6c0af8c840933674f92f7d98f225a"
"reference": "bb659c13905e9d5f04f9f1b0d20e42c3344a459c"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -531,7 +531,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "62511894b74a5b7651c54ed3a09e2e693a92008a"
"reference": "86516ecaf9371dd7e02b197f4766b694315a346c"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -618,7 +618,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "9122193d421ca5358d8fd79c2b61887d4ce7f220"
"reference": "b92d20a54b77ff61f259eafe8ef97104e7d1d997"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -675,7 +675,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "f9960059a293aca58dfdc2e4e26e8da46cbaab18"
"reference": "9053eea049ed7d7f0f72402cba859fbbaed38d4d"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -731,7 +731,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
"reference": "a3d1843ec48a866e4ff38a80b70834ed1237eec7"
"reference": "330c1a93aa82982a2181702014d9d8afed44db13"
},
"require": {
"automattic/jetpack-connection": "^6.4.0-alpha",
Expand Down Expand Up @@ -809,7 +809,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "6651d4d4399f9b26396477ba7eef7496a09a733c"
"reference": "b7098de4ae2ebb79a5e6c121497a8c590661a305"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -870,7 +870,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "38a724ac1f5d7286f811a3eb36e1db4e8099c35b"
"reference": "03b210bd5c21b32e2c68a3aee90072dec153db1c"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -948,7 +948,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "98a7ffbe81ad9d8938a355a8b5c0218f1923f445"
"reference": "c0966b5884f945f99106388bac9c07dcff48251c"
},
"require": {
"automattic/jetpack-connection": "^6.4.0-alpha",
Expand Down Expand Up @@ -1007,7 +1007,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "42c6b1e21ca1fd9dc76a2db50d2dea8f14a5945f"
"reference": "2a4e7bfb9a2d275c3a0819c0fdd29d05dd867130"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1063,7 +1063,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "dda279321d1410d84e805019c8bae4a4d845c8ab"
"reference": "b27248bf6361fae29dc05f0dc3ea5cb9fe11e585"
},
"require": {
"automattic/jetpack-admin-ui": "^0.5.2",
Expand Down Expand Up @@ -1162,7 +1162,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "167a0b9637528480012908710277f34edf80c5d4"
"reference": "fff82d1456e33d99b2d7cf01aff91be0970e0a12"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1220,7 +1220,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "b4a0b6ae680120930a1b9c90e5b094dae795ddf1"
"reference": "7478c21478260f8d600852d4f4b0a6bed0f056ed"
},
"require": {
"automattic/jetpack-connection": "^6.4.0-alpha",
Expand Down Expand Up @@ -1285,7 +1285,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "2053f1fbe10e2c488c9070c14412eeb12bb275f5"
"reference": "b6940a71e0f3958ac7d6b4394967567a84a92a47"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -1344,7 +1344,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
"reference": "ad2973edcfc75c8ca81d4b4f7151545ac31fec2c"
"reference": "6a60d8d6e8ef2d4b9f1a64ac95a6ab8d284fd799"
},
"require": {
"automattic/jetpack-redirect": "^3.0.1",
Expand Down Expand Up @@ -1412,7 +1412,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
"reference": "9baa9ccf34585a971eaee033b3c2fa0b995ec957"
"reference": "32df656ec40f3a7d116f4521aae2a401e0789d5e"
},
"require": {
"automattic/jetpack-connection": "^6.4.0-alpha",
Expand Down Expand Up @@ -1484,7 +1484,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "4a9e519693c7f6a9cf5cc8efed624876bbd00a1a"
"reference": "d42b62df46a773430be5b58c4f7dbd8ce4b279af"
},
"require": {
"automattic/jetpack-status": "^5.0.3",
Expand Down Expand Up @@ -1542,7 +1542,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "05a641c15fb580202de79b0a334c920a73095339"
"reference": "cf18d909a9680c4291ec5754ef64b43856d5b96d"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1599,7 +1599,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "6ba64c93d2bb0c8cfa0a2abf4ad144fae72b6cba"
"reference": "4e3216960e0fa97e0e041b58d5cd263017972ff6"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
Expand Down Expand Up @@ -1666,7 +1666,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "9994fcc18ef87e24d2ce87744abb21b785b90360"
"reference": "47178d16b53b1987ab434dbd17308b5ebd614173"
},
"require": {
"automattic/jetpack-connection": "^6.4.0-alpha",
Expand Down
Loading

0 comments on commit e6ba380

Please sign in to comment.