Drop watchlist in user menu feature flag

Working correctly. No longer needed.

Additional change:
* add tooltip to menu

Depends-On: I418ce75bda8015520d1f1742ddcdfefbc8b9a162
Bug: T289619
Change-Id: I42f21ca8836e5042d07102e1516ca386478dfabc

i18n/en.json

@@ -4,6 +4,7 @@
 	},
 	"skinname-vector": "Vector",
 	"skinname-vector-2022": "Vector 2022",
+	"tooltip-pt-watchlist-2": "A list of pages you are monitoring for changes",
 	"vector-skin-desc": "Modern version of MonoBook with fresh look and many usability improvements",
 	"prefs-vector-enable-vector-1-label": "Use Legacy Vector",
 	"prefs-vector-enable-vector-1-help": "Over the next few years, we will be gradually updating the Vector skin. Legacy Vector will allow you to view the old version of Vector (as of December 2019). To learn more about the updates, go to our [[mw:Reading/Web/Desktop_Improvements|project page]].",

i18n/qqq.json

@@ -17,6 +17,7 @@
 	},
 	"skinname-vector": "{{name}}",
 	"skinname-vector-2022": "{{name}}",
+	"tooltip-pt-watchlist-2": "Watchlist link tooltip.",
 	"vector-skin-desc": "{{desc|what=skin|name=Vector|url=https://www.mediawiki.org/wiki/Skin:Vector}}",
 	"prefs-vector-enable-vector-1-label": "Label for the checkbox to force Legacy Vector operation accessible via Special:Preferences. When this checkbox is enabled, the December 2019 of Vector is used. When this checkbox is disabled, the actively developed version of Vector is used instead.",
 	"prefs-vector-enable-vector-1-help": "Detail explaining the operation of the prefs-vector-enable-vector-1-label checkbox.",

includes/Constants.php

@@ -217,23 +217,6 @@ final class Constants {
 	 */
 	public const FEATURE_STICKY_HEADER_EDIT = 'StickyHeaderEdit';
 
-	/**
-	 * @var string
-	 */
-	public const FEATURE_USER_LINKS_WATCHLIST = 'UserLinksWatchlist';
-	/**
-	 * @var string
-	 */
-	public const REQUIREMENT_USER_LINKS_WATCHLIST = 'UserLinksWatchlist';
-	/**
-	 * @var string
-	 */
-	public const CONFIG_USER_LINKS_WATCHLIST = 'VectorUserLinksWatchlist';
-	/**
-	 * @var string
-	 */
-	public const QUERY_PARAM_USER_LINKS_WATCHLIST = 'vectoruserlinkswatchlist';
-
 	/**
 	 * Defines whether the Sticky Header A/B test is running. See
 	 * https://phabricator.wikimedia.org/T292587 for additional detail about the test.

includes/ServiceWiring.php

@@ -248,21 +248,6 @@ return [
 			)
 		);
 
-		// Temporary feature flag for moving watchlist out of user menu
-		// Remove when the new watchlist icon is in OOUI
-		$featureManager->registerRequirement(
-			new OverridableConfigRequirement(
-				$services->getMainConfig(),
-				$context->getUser(),
-				$context->getRequest(),
-				null,
-				Constants::CONFIG_USER_LINKS_WATCHLIST,
-				Constants::REQUIREMENT_USER_LINKS_WATCHLIST,
-				Constants::QUERY_PARAM_USER_LINKS_WATCHLIST,
-				null
-			)
-		);
-
 		$featureManager->registerFeature(
 			Constants::FEATURE_STICKY_HEADER,
 			[
@@ -282,15 +267,6 @@ return [
 			]
 		);
 
-		$featureManager->registerFeature(
-			Constants::FEATURE_USER_LINKS_WATCHLIST,
-			[
-				Constants::REQUIREMENT_FULLY_INITIALISED,
-				Constants::REQUIREMENT_LATEST_SKIN_VERSION,
-				Constants::REQUIREMENT_USER_LINKS_WATCHLIST,
-			]
-		);
-
 		return $featureManager;
 	}
 ];

skin.json

@@ -461,10 +461,6 @@
 			},
 			"description": "@var array Enables the edit icons if $wgVectorStickyHeader is true."
 		},
-		"VectorUserLinksWatchlist": {
-			"value": false,
-			"description": "@var string Enables moving the watchlist to outside the user menu if true. This feature flag is temporary and subject to removal. "
-		},
 		"VectorWebABTestEnrollment": {
 			"value": {
 				"name": "vector.sticky_header",