Jetpack Search: Duplicate "Search" menu item on Atomic sites

[lsl]

Impacted plugin

Jetpack, None / Other

Steps to Reproduce

Load an atomic site on calypso/wpcom,

In the Jetpack submenu you'll see two search options:

And you'll get this error in the console as a sideeffect (I'm guessing we key these using the menu item text):

Warning: Encountered two children with the same key, `Search`. Keys should be unique so that components maintain their identity across updates. Non-unique keys may cause children to be duplicated and/or omitted — the behavior is unsupported and could change in a future version.

A clear and concise description of what you expected to happen.

• Not see the react key warning in wp-calypso.
• Not see two search items in the menu

What actually happened

The console warning + two menu options, loading different search screens:

1. https://wordpress.com/jetpack-search/wooptestupgrade.wpcomstaging.com
2. https://wooptestupgrade.wpcomstaging.com/wp-admin/admin.php?page=jetpack-search

Other information

This could have been active for a while, add_jetpack_menu is adding the calypso route menu item and Jetpack_Search_Customberg is adding the wp-admin page.

I'm guessing the wp-admin menu should only be shown to Jetpack .org users and (I think) needs to be moved to class.jetpack-admin-menu.php or at least hidden in class.wp-admin-menu.php.

cc @JasonMoon re #20282

Operating System

No response

OS Version

all

Browser

Other / Not applicable

Browser Version(s)

all

Also tracking this in wp-calypso

Automattic/wp-calypso#56741