Masterbar: Use Calypso import/export only on simple sites (#18296)

* Masterbar: Use Calypso import/expert only on simple sites Fixes #18294. * Continue linking Import to Calypso. Co-authored-by: Jeremy Herve <jeremy@jeremy.hu>
Automattic · Jan 15, 2021 · b5fcd79 · b5fcd79
1 parent 8e6a7f8
commit b5fcd79
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 27 deletions.
diff --git a/projects/plugins/jetpack/modules/masterbar/admin-menu/class-admin-menu.php b/projects/plugins/jetpack/modules/masterbar/admin-menu/class-admin-menu.php
@@ -450,15 +450,12 @@ public function add_tools_menu( $calypso = true ) {
 		remove_menu_page( $admin_slug );
 		remove_submenu_page( $admin_slug, $admin_slug );
 		remove_submenu_page( $admin_slug, 'import.php' );
-		remove_submenu_page( $admin_slug, 'export.php' );
 		remove_submenu_page( $admin_slug, 'delete-blog' );
 
 		add_menu_page( esc_attr__( 'Tools', 'jetpack' ), __( 'Tools', 'jetpack' ), 'manage_options', $menu_slug, null, 'dashicons-admin-tools', 75 );
 		add_submenu_page( $menu_slug, esc_attr__( 'Import', 'jetpack' ), __( 'Import', 'jetpack' ), 'import', 'https://wordpress.com/import/' . $this->domain, null, 15 );
-		add_submenu_page( $menu_slug, esc_attr__( 'Export', 'jetpack' ), __( 'Export', 'jetpack' ), 'export', 'https://wordpress.com/export/' . $this->domain, null, 20 );
 
 		$this->migrate_submenus( $admin_slug, $menu_slug );
-
 	}
 
 	/**

diff --git a/projects/plugins/jetpack/modules/masterbar/admin-menu/class-wpcom-admin-menu.php b/projects/plugins/jetpack/modules/masterbar/admin-menu/class-wpcom-admin-menu.php
@@ -303,8 +303,11 @@ public function add_users_menu( $calypso = true ) {
 	public function add_tools_menu( $calypso = true ) {
 		$menu_slug = $calypso ? 'https://wordpress.com/marketing/tools/' . $this->domain : 'tools.php';
 
+		remove_submenu_page( 'tools.php', 'export.php' );
+
 		add_submenu_page( $menu_slug, esc_attr__( 'Marketing', 'jetpack' ), __( 'Marketing', 'jetpack' ), 'manage_options', 'https://wordpress.com/marketing/tools/' . $this->domain, null, 5 );
 		add_submenu_page( $menu_slug, esc_attr__( 'Earn', 'jetpack' ), __( 'Earn', 'jetpack' ), 'manage_options', 'https://wordpress.com/earn/' . $this->domain, null, 10 );
+		add_submenu_page( $menu_slug, esc_attr__( 'Export', 'jetpack' ), __( 'Export', 'jetpack' ), 'export', 'https://wordpress.com/export/' . $this->domain, null, 20 );
 
 		parent::add_tools_menu( $calypso );
 	}

diff --git a/projects/plugins/jetpack/tests/php/modules/masterbar/test-class-admin-menu.php b/projects/plugins/jetpack/tests/php/modules/masterbar/test-class-admin-menu.php
@@ -645,14 +645,6 @@ public function test_add_tools_menu() {
 		);
 		$this->assertContains( $import_submenu_item, $submenu[ $slug ] );
 
-		$export_submenu_item = array(
-			'Export',
-			'export',
-			'https://wordpress.com/export/' . static::$domain,
-			'Export',
-		);
-		$this->assertContains( $export_submenu_item, $submenu[ $slug ] );
-
 		// NOT contains the following menu items.
 
 		$tools_submenu_item = array(
@@ -668,13 +660,6 @@ public function test_add_tools_menu() {
 			'import.php',
 		);
 		$this->assertNotContains( $import_submenu_item, $submenu[ $slug ] );
-
-		$export_submenu_item = array(
-			'Export',
-			'export',
-			'export.php',
-		);
-		$this->assertNotContains( $export_submenu_item, $submenu[ $slug ] );
 	}
 
 	/**

diff --git a/projects/plugins/jetpack/tests/php/modules/masterbar/test-class-atomic-admin-menu.php b/projects/plugins/jetpack/tests/php/modules/masterbar/test-class-atomic-admin-menu.php
@@ -449,8 +449,7 @@ public function test_add_tools_menu() {
 		$export_submenu_item = array(
 			'Export',
 			'export',
-			'https://wordpress.com/export/' . static::$domain,
-			'Export',
+			'export.php',
 		);
 		$this->assertContains( $export_submenu_item, $submenu[ $slug ] );
 
@@ -469,13 +468,6 @@ public function test_add_tools_menu() {
 			'import.php',
 		);
 		$this->assertNotContains( $import_submenu_item, $submenu[ $slug ] );
-
-		$export_submenu_item = array(
-			'Export',
-			'export',
-			'export.php',
-		);
-		$this->assertNotContains( $export_submenu_item, $submenu[ $slug ] );
 	}
 
 	/**