From 080049ffc5f802a694321137e8c9d3d1524e8581 Mon Sep 17 00:00:00 2001
From: Piotr Miazga <piotr@polishdeveloper.pl>
Date: Mon, 24 Jun 2019 18:15:06 +0200
Subject: [PATCH] Add contributions link to toolbar on User pages

We would like to hide the user links and show only toobar when
OverflowMenu is visible. The User contributions link is available
only in user_links section only, as we're going to hide this
section, we need to move that link to the Toolbar.

Bug: T224735
Change-Id: Ib4f297993213fcc8fc3dd998e282e5b39957485e
---
 includes/ServiceWiring.php                   |  4 +-
 includes/menu/PageActions/ToolbarBuilder.php | 45 +++++++++++++++++++-
 includes/skins/SkinMinerva.php               |  1 +
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index f2cac15..e624dfd 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -58,7 +58,9 @@ return [
 			$context->getUser(),
 			$context,
 			$services->getPermissionManager(),
-			$services->getService( 'Minerva.Permissions' )
+			$services->getService( 'Minerva.Permissions' ),
+			$skinOptions,
+			$services->get( 'Minerva.SkinUserPageHelper' )
 		);
 		if ( $skinOptions->get( SkinOptions::OPTION_OVERFLOW_SUBMENU ) ) {
 			 $overflowBuilder = $userPageHelper->isUserPage() ?
diff --git a/includes/menu/PageActions/ToolbarBuilder.php b/includes/menu/PageActions/ToolbarBuilder.php
index ec5502d..fd674c1 100644
--- a/includes/menu/PageActions/ToolbarBuilder.php
+++ b/includes/menu/PageActions/ToolbarBuilder.php
@@ -26,6 +26,8 @@ use MediaWiki\Minerva\Menu\Group;
 use MediaWiki\Minerva\Menu\IMenuEntry;
 use MediaWiki\Minerva\Menu\LanguageSelectorEntry;
 use MediaWiki\Minerva\Permissions\IMinervaPagePermissions;
+use MediaWiki\Minerva\SkinOptions;
+use MediaWiki\Minerva\SkinUserPageHelper;
 use MediaWiki\Permissions\PermissionManager;
 use MessageLocalizer;
 use MinervaUI;
@@ -59,6 +61,16 @@ class ToolbarBuilder {
 	 * @var PermissionManager
 	 */
 	private $permissionsManager;
+
+	/**
+	 * @var SkinOptions
+	 */
+	private $skinOptions;
+
+	/**
+	 * @var SkinUserPageHelper
+	 */
+	private $userPageHelper;
 	/**
 	 * Build Group containing icons for toolbar
 	 * @param Title $title Article title user is currently browsing
@@ -66,18 +78,25 @@ class ToolbarBuilder {
 	 * @param MessageLocalizer $msgLocalizer Message localizer to generate localized texts
 	 * @param PermissionManager $permissionManager Mediawiki Permissions Manager
 	 * @param IMinervaPagePermissions $permissions Minerva permissions system
+	 * @param SkinOptions $skinOptions Skin options
+	 * @param SkinUserPageHelper $userPageHelper User Page helper
 	 */
 	public function __construct(
 		Title $title,
 		User $user,
 		MessageLocalizer $msgLocalizer,
 		PermissionManager $permissionManager,
-		IMinervaPagePermissions $permissions ) {
+		IMinervaPagePermissions $permissions,
+		SkinOptions $skinOptions,
+		SkinUserPageHelper $userPageHelper
+	) {
 		$this->title = $title;
 		$this->user = $user;
 		$this->messageLocalizer = $msgLocalizer;
 		$this->permissionsManager = $permissionManager;
 		$this->permissions = $permissions;
+		$this->skinOptions = $skinOptions;
+		$this->userPageHelper = $userPageHelper;
 	}
 
 	/**
@@ -103,6 +122,13 @@ class ToolbarBuilder {
 			$group->insertEntry( $this->getHistoryPageAction() );
 		}
 
+		if ( $this->skinOptions->get( SkinOptions::OPTION_OVERFLOW_SUBMENU ) &&
+			$this->userPageHelper->isUserPage() ) {
+			// User links are hidden when Overflow menu is visible. We want to show Contributions
+			// link on toolbar only when overflow is visible
+			$group->insertEntry( $this->createContributionsPageAction() );
+		}
+
 		Hooks::run( 'MobileMenu', [ 'pageactions.toolbar', &$group ] );
 
 		// We want the edit icon/action always to be the last element on the toolbar list
@@ -112,6 +138,23 @@ class ToolbarBuilder {
 		return $group;
 	}
 
+	/**
+	 * Create Contributions page action visible on user pages
+	 *
+	 * @return IMenuEntry
+	 */
+	protected function createContributionsPageAction(): IMenuEntry {
+		$pageUser = $this->userPageHelper->getPageUser();
+		$label = $this->messageLocalizer->msg( 'mobile-frontend-user-page-contributions' );
+
+		return PageActionMenuEntry::create(
+			'page-actions-contributions',
+			SpecialPage::getTitleFor( 'Contributions', $pageUser )->getLocalURL(),
+			MinervaUI::iconClass( 'contributions' ),
+			$label
+		)->setTitle( $label );
+	}
+
 	/**
 	 * Creates the "edit" page action: the well-known pencil icon that, when tapped, will open an
 	 * editor with the lead section loaded.
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 36fe854..3b67a5a 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -943,6 +943,7 @@ class SkinMinerva extends SkinTemplate {
 			'mediawiki.ui.icon',
 			'mediawiki.ui.button',
 			'skins.minerva.icons.images',
+			'skins.minerva.mainMenu.icons',
 			'wikimedia.ui'
 		];
 		if ( $title->isMainPage() ) {