Agency Managed: Remove the admin interface option (#38006)

* Hide admin interface setting if is_agency_managed_site * changelog Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/9653407142 Upstream-Ref: Automattic/jetpack@fb19848
Automattic · Jun 24, 2024 · cbe7036 · cbe7036
1 parent a184805
commit cbe7036
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 58 deletions.
diff --git a/.../automattic/jetpack-mu-wpcom/src/features/wpcom-admin-interface/wpcom-admin-interface.php b/.../automattic/jetpack-mu-wpcom/src/features/wpcom-admin-interface/wpcom-admin-interface.php
@@ -14,6 +14,9 @@
  * The setting is displayed only if the has the wp-admin interface selected.
  */
 function wpcomsh_wpcom_admin_interface_settings_field() {
+	if ( is_agency_managed_site() ) {
+		return;
+	}
 	add_settings_field( 'wpcom_admin_interface', '', 'wpcom_admin_interface_display', 'general', 'default' );
 
 	register_setting( 'general', 'wpcom_admin_interface', array( 'sanitize_callback' => 'esc_attr' ) );

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -77,7 +77,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
-                "reference": "f3552ef322a1651aa5c9d81589a091aad1b47238"
+                "reference": "f2407700d056a59da1a9f06c757ef9cfe5bd12ca"
             },
             "require": {
                 "php": ">=7.0"
@@ -130,7 +130,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
-                "reference": "52b00bc562e767a7389453a076964873fcbaf764"
+                "reference": "f11db4db8d9980c284b5bfd8b12a5c4e47850607"
             },
             "require": {
                 "php": ">=7.0"
@@ -195,7 +195,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-assets",
-                "reference": "afc29ca4f0268dad10e8cfa6ab339495652ad94f"
+                "reference": "c4d3a7eb13762aebb0c6409dd03ad2326df2a062"
             },
             "require": {
                 "automattic/jetpack-constants": "^2.0.3",
@@ -264,7 +264,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-blaze",
-                "reference": "da997962cdbb9d097650f495994db07261fd0cb5"
+                "reference": "813fb5fbd039842ae9c22777496f5b19895bb3fe"
             },
             "require": {
                 "automattic/jetpack-assets": "^2.1.12",
@@ -345,7 +345,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-blocks",
-                "reference": "acf587f31886b417545b23b30870aa9c1d58f5e5"
+                "reference": "4abd8c3e645e4d6dc7689d4e25c1160ab1f7c1e6"
             },
             "require": {
                 "automattic/jetpack-constants": "^2.0.3",
@@ -407,7 +407,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-calypsoify",
-                "reference": "2b644d4fb68dee0ddfb46c709b5ecf9238891f6d"
+                "reference": "aa96cbc947c359c0308319991aed940a159c3b83"
             },
             "require": {
                 "automattic/jetpack-assets": "^2.1.12",
@@ -472,7 +472,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-classic-theme-helper",
-                "reference": "4ed07138766d44227cdb77e56e3bf169aae3b274"
+                "reference": "ec72a483b762bb5d2bb36fd1050c296d6d68e2fc"
             },
             "require": {
                 "automattic/jetpack-assets": "^2.1.12",
@@ -543,7 +543,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-compat",
-                "reference": "d8e2b82954933f0472e1268b1045ef5b7a38257a"
+                "reference": "bc0b54ac1708ea88085c609f433ca9ba570e5549"
             },
             "require": {
                 "php": ">=7.0"
@@ -583,7 +583,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-config",
-                "reference": "76110fd0d811bd3012a9a89acf39944410f4842c"
+                "reference": "6b4bda9eddedd18ab8d4d0e31863f4870b14f16b"
             },
             "require": {
                 "php": ">=7.0"
@@ -658,7 +658,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-connection",
-                "reference": "11e873a0e65cbdd3d966400c94ecf802a0f13d94"
+                "reference": "deb4d952fa299724ed60f4b25b1e67b253d33a5d"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^2.0.1",
@@ -745,7 +745,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-constants",
-                "reference": "3e012984c1652c012e01accad76088ecac7a5879"
+                "reference": "e750f30f87ad8bbb17202e72d6ec3892e4a50421"
             },
             "require": {
                 "php": ">=7.0"
@@ -799,7 +799,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
-                "reference": "9223029c39363a49027a32bef6e3e946afccb711"
+                "reference": "48a4a550bc3e426fc6405e342a516b3219f42f70"
             },
             "require": {
                 "php": ">=7.0"
@@ -852,7 +852,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-ip",
-                "reference": "54991b19f49d7710a17392edcccdb499d9b475bd"
+                "reference": "99dc1ab290b0c5a4d500d13fca655a764f9f7659"
             },
             "require": {
                 "php": ">=7.0"
@@ -910,7 +910,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
-                "reference": "7dd65599c802cec1e78afbf959411663f50fea8d"
+                "reference": "b9bfd50ca3974fc8b9078487e3a57ca152e11de3"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^2.0.1",
@@ -985,7 +985,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-logo",
-                "reference": "8b0fbd691786c97fb0598df7786a5f10e384d1a0"
+                "reference": "906b7c70a86137e0c4a3efbb4ca8ca8fc4140f14"
             },
             "require": {
                 "php": ">=7.0"
@@ -1038,7 +1038,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-masterbar",
-                "reference": "8528b1c844fad5958123f98a49762a308da50af0"
+                "reference": "3c1bbc96ce5d6291ad3d4fb6abc0af8a7ab200c7"
             },
             "require": {
                 "automattic/jetpack-assets": "^2.1.12",
@@ -1115,12 +1115,12 @@
         },
         {
             "name": "automattic/jetpack-mu-wpcom",
-            "version": "5.38.0-alpha.1719267995",
-            "version_normalized": "5.38.0.0-alpha1719267995",
+            "version": "5.38.0-alpha.1719268708",
+            "version_normalized": "5.38.0.0-alpha1719268708",
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom",
-                "reference": "d27bd854588b05609aec5bb478c6a1b53a82dd1d"
+                "reference": "5fd6cf5ba96fd5d7666c2d8c9d4c01a51682b90d"
             },
             "require": {
                 "automattic/jetpack-assets": "^2.1.12",
@@ -1201,7 +1201,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
-                "reference": "3b55faa1d52bf02becbe85e175a3bd87d048ee20"
+                "reference": "8f59a76da7f93edc53238d11eddb52974233b252"
             },
             "require": {
                 "php": ">=7.0"
@@ -1262,7 +1262,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plans",
-                "reference": "bc27abcb64d90b47908e8d7da90c6a1e22c969c4"
+                "reference": "ed5da2960865ac5703edf6e05bedf1ae55b7e2c1"
             },
             "require": {
                 "automattic/jetpack-connection": "^2.10.1",
@@ -1330,7 +1330,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-post-list",
-                "reference": "c10ae062823485d676f7b647b940c393985e0f74"
+                "reference": "1db7cb7f56804df93b8065187faa2f420aa5bd3b"
             },
             "require": {
                 "automattic/jetpack-assets": "^2.1.12",
@@ -1395,7 +1395,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
-                "reference": "15d6976b36519ad9eb0990a89d00b9c26fac0b70"
+                "reference": "c88e47999d174d72b60565b44dca9425b96dd83f"
             },
             "require": {
                 "automattic/jetpack-status": "^3.3.2",
@@ -1450,7 +1450,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-roles",
-                "reference": "b3e1fff856e06a74a2614748b988db341b0d5e13"
+                "reference": "abb49a937c76da3ead32687bd355c5a63bd1df99"
             },
             "require": {
                 "php": ">=7.0"
@@ -1504,7 +1504,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-stats",
-                "reference": "c9dd7e56577d07bc17e0e191455709c18d7f1c9c"
+                "reference": "80c4bbddd20fb7ceb3d3c2e656f52d42560bcb16"
             },
             "require": {
                 "automattic/jetpack-connection": "^2.10.1",
@@ -1571,7 +1571,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-stats-admin",
-                "reference": "d04be10da39d2fafce94ab20843688d464dfbba5"
+                "reference": "3f1dfdca770acc649e6410ac88d583e35b00f67d"
             },
             "require": {
                 "automattic/jetpack-connection": "^2.10.1",
@@ -1644,7 +1644,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-status",
-                "reference": "478c8f49b45779a0c0e8c58c239d3c739d1897fe"
+                "reference": "c24ad275e7bfc6776de8a31351fc0e43413cad32"
             },
             "require": {
                 "automattic/jetpack-constants": "^2.0.3",
@@ -1708,7 +1708,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-sync",
-                "reference": "96d1530e9d720a157456141e4c32429c61841446"
+                "reference": "40fcae57b3c6859a883e236414dd11d1ed5dca2b"
             },
             "require": {
                 "automattic/jetpack-connection": "^2.10.1",
@@ -1786,7 +1786,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/scheduled-updates",
-                "reference": "8427a6ac1b4143013320377087347d87b758587d"
+                "reference": "a9f69565cd3afda408df3866bd46ee43f8e9c5c5"
             },
             "require": {
                 "automattic/jetpack-connection": "^2.10.1",