2014-08-07 11:38:34 +00:00
|
|
|
<?php
|
|
|
|
/**
|
|
|
|
* Vector - Modern version of MonoBook with fresh look and many usability
|
|
|
|
* improvements.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
|
|
*
|
|
|
|
* @file
|
|
|
|
* @ingroup Skins
|
|
|
|
*/
|
|
|
|
|
2020-04-28 21:16:21 +00:00
|
|
|
use MediaWiki\MediaWikiServices;
|
2020-07-07 08:59:14 +00:00
|
|
|
use Vector\Constants;
|
2020-09-01 19:31:15 +00:00
|
|
|
use Vector\VectorServices;
|
2020-07-07 08:59:14 +00:00
|
|
|
|
2014-08-07 11:38:34 +00:00
|
|
|
/**
|
2020-04-28 21:16:21 +00:00
|
|
|
* Skin subclass for Vector
|
2014-08-07 11:38:34 +00:00
|
|
|
* @ingroup Skins
|
2020-07-09 16:42:33 +00:00
|
|
|
* Skins extending SkinVector are not supported
|
2020-08-04 00:17:53 +00:00
|
|
|
* @package Vector
|
|
|
|
* @internal
|
2014-08-07 11:38:34 +00:00
|
|
|
*/
|
2020-07-09 16:42:33 +00:00
|
|
|
class SkinVector extends SkinMustache {
|
2021-02-10 19:40:47 +00:00
|
|
|
/** @var null|array for caching purposes */
|
|
|
|
private $languages;
|
2020-04-07 22:55:08 +00:00
|
|
|
/** @var int */
|
2020-04-03 20:05:22 +00:00
|
|
|
private const MENU_TYPE_DEFAULT = 0;
|
2020-04-07 22:55:08 +00:00
|
|
|
/** @var int */
|
2020-04-03 20:05:22 +00:00
|
|
|
private const MENU_TYPE_TABS = 1;
|
2020-04-07 22:55:08 +00:00
|
|
|
/** @var int */
|
2020-04-03 20:05:22 +00:00
|
|
|
private const MENU_TYPE_DROPDOWN = 2;
|
2020-04-07 23:21:20 +00:00
|
|
|
private const MENU_TYPE_PORTAL = 3;
|
2020-04-03 20:05:22 +00:00
|
|
|
|
Add opt-out link to Sidebar for Vector/Logged-in Users Without Abstractions
This commit is singularly focused on adding a link to the sidebar for
Vector, logged-in users. It does the bare minimum to fulfill the
requirements of T243281.
Additionally, it will help to answer the question "Do we need to use
abstractions (other than maybe different templates) to separate Legacy
Vector from Vector" by intentionally leaving out any abstractions in
order to make it easier to compare with a follow-up patch
(Ib2ef15180df73360cc1de25b893e49d415d23e1a) which does use abstractions.
It is a good thing to question whether or not we need addtional
abstractions in VectorTemplate and if they will help us as unnecessary
abstractions can have the opposite effect and just lead to further
frustrations down the road.
Therefore, I urge you, the reviewer, to let me know your thoughts! If
abstractions are viewed as not making our lives any easier, the
follow-up patches may be completely discarded and that's totally okay
with me. :) I think it's a good think to talk about now though.
Important changes:
* The VectorTemplate constructor was changed to allow injecting the
config, templateParser, and isLegacy boolean (only the config was
allowed before this commit). According to MediaWiki's Stable Interface
Policy, "Constructor signatures are generally considered unstable unless
explicitly declared stable for calling" [3]. Given that VecorTemplate's
constructor is not marked as stable, it is justified to do this without
warning according to the policy.
* Due to the above, the 'setTemplate' method is no longer needed and was
marked as deprecated.
* VectorTemplateTest was made to adapt to the new VectorTemplate
constructor. Additionally, it now extends from
MediaWikiIntegrationTestCase which my intelliphense server can pick up.
I *think* MediaWikiTestCase is just an alias to
MediaWikiIntegrationTestCase [1] and MediaWikiTestCase file was renamed
to MediaWikiIntegrationTestCase in [2], but I'm willing to change it
back if there is pushback to this.
Open questions:
* What are VectorTemplate's responsibilities? To me, it acts right now
as a controller (because it echos the full HTML string from the
template), a model (because SkinTemplate::prepareQuickTemplate sets data
on it which it later retrieves through `$this->get()`), a presenter
(because it adds data tailored for a web-centric view), and a view
(because it renders HTML strings instead of letting the view/template be
solely responsible for that). Arguably, some business logic might be
mixed in there as well (because it checks to see if a User is logged
in/has necessary permissions to show x which my changes here add to).
This might not be a problem if we keep VectorTemplate relatively small,
but will it remain this way as we progress further in Desktop
Improvements?
* How do we write tests for VectorTemplate without exposing unnecessary
public methods? For example, if I want to test the `getSkinData()`
method to see what state will be sent to the template, how should I do
this? One option might be to use `TestingAccessWrapper` to expose these
private methods which is what
`VectorTemplateTest::testbuildViewsProps()` does. Another option is to
accept this method as public. Is there a better way? Keep in mind that
even with access to this method, there might be many things to mock.
[1] https://github.com/wikimedia/mediawiki/blob/0030cb525be6cabc1d63de80586b2017d4bbe354/tests/common/TestsAutoLoader.php#L64
[2] Ie717b0ecf4fcfd089d46248f14853c80b7ef4a76
[3] https://www.mediawiki.org/wiki/Stable_interface_policy
Bug: T243281
Change-Id: I0571b041bcd7f19bec9f103fa7bccdd093f6394d
2020-03-17 20:21:33 +00:00
|
|
|
/**
|
|
|
|
* T243281: Code used to track clicks to opt-out link.
|
|
|
|
*
|
|
|
|
* The "vct" substring is used to describe the newest "Vector" (non-legacy)
|
|
|
|
* feature. The "w" describes the web platform. The "1" describes the version
|
|
|
|
* of the feature.
|
|
|
|
*
|
|
|
|
* @see https://wikitech.wikimedia.org/wiki/Provenance
|
|
|
|
* @var string
|
|
|
|
*/
|
|
|
|
private const OPT_OUT_LINK_TRACKING_CODE = 'vctw1';
|
2014-08-07 11:38:34 +00:00
|
|
|
|
2020-01-13 09:23:59 +00:00
|
|
|
/**
|
2020-04-28 21:16:21 +00:00
|
|
|
* Whether or not the legacy version of the skin is being used.
|
|
|
|
*
|
|
|
|
* @return bool
|
2020-01-13 09:23:59 +00:00
|
|
|
*/
|
2020-04-28 21:16:21 +00:00
|
|
|
private function isLegacy() : bool {
|
|
|
|
$isLatestSkinFeatureEnabled = MediaWikiServices::getInstance()
|
|
|
|
->getService( Constants::SERVICE_FEATURE_MANAGER )
|
|
|
|
->isFeatureEnabled( Constants::FEATURE_LATEST_SKIN );
|
2020-01-16 21:11:54 +00:00
|
|
|
|
2020-04-28 21:16:21 +00:00
|
|
|
return !$isLatestSkinFeatureEnabled;
|
2020-04-28 20:58:19 +00:00
|
|
|
}
|
|
|
|
|
2020-01-16 21:11:54 +00:00
|
|
|
/**
|
2020-04-28 21:16:21 +00:00
|
|
|
* Overrides template, styles and scripts module when skin operates
|
|
|
|
* in legacy mode.
|
2020-01-16 21:11:54 +00:00
|
|
|
*
|
2020-04-28 21:16:21 +00:00
|
|
|
* @inheritDoc
|
2020-09-16 10:23:54 +00:00
|
|
|
* @param array|null $options Note; this param is only optional for internal purpose.
|
|
|
|
* Do not instantiate Vector, use SkinFactory to create the object instead.
|
|
|
|
* If you absolutely must to, this paramater is required; you have to provide the
|
|
|
|
* skinname with the `name` key. That's do it with `new SkinVector( ['name' => 'vector'] )`.
|
|
|
|
* Failure to do that, will lead to fatal exception.
|
2020-01-16 21:11:54 +00:00
|
|
|
*/
|
2020-04-28 21:16:21 +00:00
|
|
|
public function __construct( $options = [] ) {
|
2020-07-30 20:32:13 +00:00
|
|
|
if ( $this->isLegacy() ) {
|
2020-04-28 21:16:21 +00:00
|
|
|
$options['scripts'] = [ 'skins.vector.legacy.js' ];
|
|
|
|
$options['styles'] = [ 'skins.vector.styles.legacy' ];
|
|
|
|
$options['template'] = 'skin-legacy';
|
2021-01-29 01:53:27 +00:00
|
|
|
} else {
|
|
|
|
// For historic reasons, the viewport is added when Vector is loaded on the mobile
|
|
|
|
// domain. This is only possible for 3rd parties or by useskin parameter as there is
|
|
|
|
// no preference for changing mobile skin.
|
|
|
|
$responsive = $this->getConfig()->get( 'VectorResponsive' );
|
|
|
|
if ( ExtensionRegistry::getInstance()->isLoaded( 'MobileFrontend' ) ) {
|
|
|
|
$mobFrontContext = MediaWikiServices::getInstance()->getService( 'MobileFrontend.Context' );
|
|
|
|
if ( $mobFrontContext->shouldDisplayMobileView() ) {
|
|
|
|
$responsive = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$options['responsive'] = $responsive;
|
2020-01-16 21:11:54 +00:00
|
|
|
}
|
2021-01-29 01:53:27 +00:00
|
|
|
|
2020-04-28 21:16:21 +00:00
|
|
|
$options['templateDirectory'] = __DIR__ . '/templates';
|
|
|
|
parent::__construct( $options );
|
2020-01-13 09:23:59 +00:00
|
|
|
}
|
|
|
|
|
2021-02-10 19:40:47 +00:00
|
|
|
/**
|
|
|
|
* Calls getLanguages with caching.
|
|
|
|
* @return array
|
|
|
|
*/
|
|
|
|
private function getLanguagesCached() : array {
|
|
|
|
if ( $this->languages !== null ) {
|
|
|
|
return $this->languages;
|
|
|
|
}
|
|
|
|
$this->languages = $this->getLanguages();
|
|
|
|
return $this->languages;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This should be upstreamed to the Skin class in core once the logic is finalized.
|
2021-04-21 16:45:06 +00:00
|
|
|
* Returns false if the page is a special page without any languages, or if an action
|
2021-02-10 19:40:47 +00:00
|
|
|
* other than view is being used.
|
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
private function canHaveLanguages() : bool {
|
|
|
|
$action = Action::getActionName( $this->getContext() );
|
|
|
|
if ( $action !== 'view' ) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
$title = $this->getTitle();
|
|
|
|
// Defensive programming - if a special page has added languages explicitly, best to show it.
|
|
|
|
if ( $title && $title->isSpecialPage() && empty( $this->getLanguagesCached() ) ) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2020-08-18 21:30:25 +00:00
|
|
|
/**
|
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
private function isLanguagesInHeader() {
|
|
|
|
$featureManager = VectorServices::getFeatureManager();
|
2021-02-10 19:40:47 +00:00
|
|
|
// Disable button on pages without languages (based on Wikibase RepoItemLinkGenerator class)
|
|
|
|
|
|
|
|
return $this->canHaveLanguages() && $featureManager->isFeatureEnabled(
|
2020-08-18 21:30:25 +00:00
|
|
|
Constants::FEATURE_LANGUAGE_IN_HEADER
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2021-03-18 11:58:55 +00:00
|
|
|
/**
|
|
|
|
* If in modern Vector and no languages possible, OR the languages in header button
|
|
|
|
* is enabled but language array is empty, then we shouldn't show the langauge list.
|
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
private function shouldHideLanguages() {
|
|
|
|
return !$this->isLegacy() &&
|
|
|
|
!$this->canHaveLanguages() ||
|
|
|
|
// NOTE: T276950 - This should be revisited when an empty state for the language button is chosen.
|
|
|
|
( $this->isLanguagesInHeader() && empty( $this->getLanguagesCached() ) );
|
|
|
|
}
|
|
|
|
|
2021-04-30 02:54:54 +00:00
|
|
|
/**
|
|
|
|
* If in modern Vector and the config is set to consolidate user links, enable user link consolidation.
|
|
|
|
* @return bool
|
|
|
|
*/
|
2021-05-06 22:54:55 +00:00
|
|
|
private function shouldConsolidateUserLinks() {
|
2021-04-30 02:54:54 +00:00
|
|
|
$featureManager = VectorServices::getFeatureManager();
|
|
|
|
return !$this->isLegacy() &&
|
|
|
|
$featureManager->isFeatureEnabled(
|
|
|
|
Constants::FEATURE_CONSOLIDATE_USER_LINKS
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2014-08-07 11:38:34 +00:00
|
|
|
/**
|
2020-04-28 21:16:21 +00:00
|
|
|
* @inheritDoc
|
2014-08-07 11:38:34 +00:00
|
|
|
*/
|
2020-04-28 21:16:21 +00:00
|
|
|
public function getTemplateData() : array {
|
|
|
|
$skin = $this;
|
2020-04-28 17:58:55 +00:00
|
|
|
$out = $skin->getOutput();
|
|
|
|
$title = $out->getTitle();
|
2021-03-18 11:58:55 +00:00
|
|
|
$parentData = parent::getTemplateData();
|
|
|
|
|
|
|
|
if ( $this->shouldHideLanguages() ) {
|
|
|
|
$parentData['data-portlets']['data-languages'] = null;
|
|
|
|
}
|
2014-08-07 11:38:34 +00:00
|
|
|
|
2020-03-06 22:53:04 +00:00
|
|
|
// Naming conventions for Mustache parameters.
|
|
|
|
//
|
|
|
|
// Value type (first segment):
|
2020-04-14 22:44:33 +00:00
|
|
|
// - Prefix "is" or "has" for boolean values.
|
2020-03-06 22:53:04 +00:00
|
|
|
// - Prefix "msg-" for interface message text.
|
|
|
|
// - Prefix "html-" for raw HTML.
|
|
|
|
// - Prefix "data-" for an array of template parameters that should be passed directly
|
2020-02-17 19:49:43 +00:00
|
|
|
// to a template partial.
|
2020-03-06 22:53:04 +00:00
|
|
|
// - Prefix "array-" for lists of any values.
|
|
|
|
//
|
|
|
|
// Source of value (first or second segment)
|
|
|
|
// - Segment "page-" for data relating to the current page (e.g. Title, WikiPage, or OutputPage).
|
|
|
|
// - Segment "hook-" for any thing generated from a hook.
|
|
|
|
// It should be followed by the name of the hook in hyphenated lowercase.
|
|
|
|
//
|
|
|
|
// Conditionally used values must use null to indicate absence (not false or '').
|
2020-07-10 21:31:09 +00:00
|
|
|
|
2020-09-29 17:41:39 +00:00
|
|
|
$commonSkinData = array_merge( $parentData, [
|
2021-05-06 22:54:55 +00:00
|
|
|
'is-consolidated-user-links' => $this->shouldConsolidateUserLinks(),
|
2021-04-30 02:54:54 +00:00
|
|
|
|
2021-05-01 09:09:02 +00:00
|
|
|
'is-article' => (bool)$out->isArticle(),
|
2019-02-26 18:44:10 +00:00
|
|
|
|
2021-05-03 13:48:46 +00:00
|
|
|
'is-mainpage' => $title->isMainPage(),
|
2019-04-02 18:42:01 +00:00
|
|
|
// Remember that the string '0' is a valid title.
|
|
|
|
// From OutputPage::getPageTitle, via ::setPageTitle().
|
2020-04-28 17:58:55 +00:00
|
|
|
'html-title' => $out->getPageTitle(),
|
2019-01-23 02:51:20 +00:00
|
|
|
|
2020-07-09 16:32:45 +00:00
|
|
|
'html-categories' => $skin->getCategories(),
|
2020-09-16 12:18:54 +00:00
|
|
|
|
2020-09-30 16:02:31 +00:00
|
|
|
'input-location' => $this->getSearchBoxInputLocation(),
|
[modern] A new version of Vector with a new logo
Changes to support feature:
* ResourceLoaderSkinModule logo features are dropped
* New layout provided given the fork in layout between legacy and new.
* Legacy sidebar styles now pulled out
* breakpoint styles are not carried over from legacy Vector
The new Vector layout for now has one breakpoint.
Changes to storybook:
* The storybook script now pulls down image assets so that the logos can
be shown in storybook. The script is adjusted to make use of a static folder to
serve these images.
Note:
* The legacy mode is not touched as part of this patchset.
* The personal menu is unaffected by this patch and is out of scope.
* The alignment issue is noted, but will be solved at a later date.
* Changes to portal are out of scope.
* Adding storybook for modern descoped, given its not possible to load
both legacy layout and modern layout inside a storybook at current time.
Sample config:
$wgLogos = [
'icon' => 'https://di-logo-sandbox.firebaseapp.com/img/globe.png',
'tagline' => [
'src' => 'https://di-logo-sandbox.firebaseapp.com/img/tagline/en-tagline-117-13.svg',
'width' => 117,
'height' => 13,
],
'1x' => 'https://en.wikipedia.org/static/images/project-logos/enwiki.png',
'wordmark' => [
'src' => 'https://en.wikipedia.org/static/images/mobile/copyright/wikipedia-wordmark-en.svg',
'width' => 116,
'height' => 18,
],
];
Coauthor: Aron Manning
Bug: T246170
Change-Id: Ibc4b055150761388a6b78f9127da342c451ce0e7
2020-03-09 05:51:00 +00:00
|
|
|
|
2020-07-07 08:59:14 +00:00
|
|
|
'sidebar-visible' => $this->isSidebarVisible(),
|
2021-01-26 23:48:20 +00:00
|
|
|
|
2020-08-18 21:30:25 +00:00
|
|
|
'is-language-in-header' => $this->isLanguagesInHeader(),
|
2021-01-26 23:48:20 +00:00
|
|
|
|
|
|
|
'should-search-expand' => $this->shouldSearchExpand(),
|
2020-09-04 19:18:57 +00:00
|
|
|
] );
|
2019-02-26 18:44:10 +00:00
|
|
|
|
2020-12-18 02:51:28 +00:00
|
|
|
if ( $skin->getUser()->isRegistered() ) {
|
2020-07-30 20:32:13 +00:00
|
|
|
// Note: This data is also passed to legacy template where it is unused.
|
2020-10-08 21:51:27 +00:00
|
|
|
$commonSkinData['data-emphasized-sidebar-action'] = [
|
Add opt-out link to Sidebar for Vector/Logged-in Users Without Abstractions
This commit is singularly focused on adding a link to the sidebar for
Vector, logged-in users. It does the bare minimum to fulfill the
requirements of T243281.
Additionally, it will help to answer the question "Do we need to use
abstractions (other than maybe different templates) to separate Legacy
Vector from Vector" by intentionally leaving out any abstractions in
order to make it easier to compare with a follow-up patch
(Ib2ef15180df73360cc1de25b893e49d415d23e1a) which does use abstractions.
It is a good thing to question whether or not we need addtional
abstractions in VectorTemplate and if they will help us as unnecessary
abstractions can have the opposite effect and just lead to further
frustrations down the road.
Therefore, I urge you, the reviewer, to let me know your thoughts! If
abstractions are viewed as not making our lives any easier, the
follow-up patches may be completely discarded and that's totally okay
with me. :) I think it's a good think to talk about now though.
Important changes:
* The VectorTemplate constructor was changed to allow injecting the
config, templateParser, and isLegacy boolean (only the config was
allowed before this commit). According to MediaWiki's Stable Interface
Policy, "Constructor signatures are generally considered unstable unless
explicitly declared stable for calling" [3]. Given that VecorTemplate's
constructor is not marked as stable, it is justified to do this without
warning according to the policy.
* Due to the above, the 'setTemplate' method is no longer needed and was
marked as deprecated.
* VectorTemplateTest was made to adapt to the new VectorTemplate
constructor. Additionally, it now extends from
MediaWikiIntegrationTestCase which my intelliphense server can pick up.
I *think* MediaWikiTestCase is just an alias to
MediaWikiIntegrationTestCase [1] and MediaWikiTestCase file was renamed
to MediaWikiIntegrationTestCase in [2], but I'm willing to change it
back if there is pushback to this.
Open questions:
* What are VectorTemplate's responsibilities? To me, it acts right now
as a controller (because it echos the full HTML string from the
template), a model (because SkinTemplate::prepareQuickTemplate sets data
on it which it later retrieves through `$this->get()`), a presenter
(because it adds data tailored for a web-centric view), and a view
(because it renders HTML strings instead of letting the view/template be
solely responsible for that). Arguably, some business logic might be
mixed in there as well (because it checks to see if a User is logged
in/has necessary permissions to show x which my changes here add to).
This might not be a problem if we keep VectorTemplate relatively small,
but will it remain this way as we progress further in Desktop
Improvements?
* How do we write tests for VectorTemplate without exposing unnecessary
public methods? For example, if I want to test the `getSkinData()`
method to see what state will be sent to the template, how should I do
this? One option might be to use `TestingAccessWrapper` to expose these
private methods which is what
`VectorTemplateTest::testbuildViewsProps()` does. Another option is to
accept this method as public. Is there a better way? Keep in mind that
even with access to this method, there might be many things to mock.
[1] https://github.com/wikimedia/mediawiki/blob/0030cb525be6cabc1d63de80586b2017d4bbe354/tests/common/TestsAutoLoader.php#L64
[2] Ie717b0ecf4fcfd089d46248f14853c80b7ef4a76
[3] https://www.mediawiki.org/wiki/Stable_interface_policy
Bug: T243281
Change-Id: I0571b041bcd7f19bec9f103fa7bccdd093f6394d
2020-03-17 20:21:33 +00:00
|
|
|
'href' => SpecialPage::getTitleFor(
|
|
|
|
'Preferences',
|
|
|
|
false,
|
2020-04-15 17:26:19 +00:00
|
|
|
'mw-prefsection-rendering-skin-skin-prefs'
|
Add opt-out link to Sidebar for Vector/Logged-in Users Without Abstractions
This commit is singularly focused on adding a link to the sidebar for
Vector, logged-in users. It does the bare minimum to fulfill the
requirements of T243281.
Additionally, it will help to answer the question "Do we need to use
abstractions (other than maybe different templates) to separate Legacy
Vector from Vector" by intentionally leaving out any abstractions in
order to make it easier to compare with a follow-up patch
(Ib2ef15180df73360cc1de25b893e49d415d23e1a) which does use abstractions.
It is a good thing to question whether or not we need addtional
abstractions in VectorTemplate and if they will help us as unnecessary
abstractions can have the opposite effect and just lead to further
frustrations down the road.
Therefore, I urge you, the reviewer, to let me know your thoughts! If
abstractions are viewed as not making our lives any easier, the
follow-up patches may be completely discarded and that's totally okay
with me. :) I think it's a good think to talk about now though.
Important changes:
* The VectorTemplate constructor was changed to allow injecting the
config, templateParser, and isLegacy boolean (only the config was
allowed before this commit). According to MediaWiki's Stable Interface
Policy, "Constructor signatures are generally considered unstable unless
explicitly declared stable for calling" [3]. Given that VecorTemplate's
constructor is not marked as stable, it is justified to do this without
warning according to the policy.
* Due to the above, the 'setTemplate' method is no longer needed and was
marked as deprecated.
* VectorTemplateTest was made to adapt to the new VectorTemplate
constructor. Additionally, it now extends from
MediaWikiIntegrationTestCase which my intelliphense server can pick up.
I *think* MediaWikiTestCase is just an alias to
MediaWikiIntegrationTestCase [1] and MediaWikiTestCase file was renamed
to MediaWikiIntegrationTestCase in [2], but I'm willing to change it
back if there is pushback to this.
Open questions:
* What are VectorTemplate's responsibilities? To me, it acts right now
as a controller (because it echos the full HTML string from the
template), a model (because SkinTemplate::prepareQuickTemplate sets data
on it which it later retrieves through `$this->get()`), a presenter
(because it adds data tailored for a web-centric view), and a view
(because it renders HTML strings instead of letting the view/template be
solely responsible for that). Arguably, some business logic might be
mixed in there as well (because it checks to see if a User is logged
in/has necessary permissions to show x which my changes here add to).
This might not be a problem if we keep VectorTemplate relatively small,
but will it remain this way as we progress further in Desktop
Improvements?
* How do we write tests for VectorTemplate without exposing unnecessary
public methods? For example, if I want to test the `getSkinData()`
method to see what state will be sent to the template, how should I do
this? One option might be to use `TestingAccessWrapper` to expose these
private methods which is what
`VectorTemplateTest::testbuildViewsProps()` does. Another option is to
accept this method as public. Is there a better way? Keep in mind that
even with access to this method, there might be many things to mock.
[1] https://github.com/wikimedia/mediawiki/blob/0030cb525be6cabc1d63de80586b2017d4bbe354/tests/common/TestsAutoLoader.php#L64
[2] Ie717b0ecf4fcfd089d46248f14853c80b7ef4a76
[3] https://www.mediawiki.org/wiki/Stable_interface_policy
Bug: T243281
Change-Id: I0571b041bcd7f19bec9f103fa7bccdd093f6394d
2020-03-17 20:21:33 +00:00
|
|
|
)->getLinkURL( 'wprov=' . self::OPT_OUT_LINK_TRACKING_CODE ),
|
|
|
|
];
|
|
|
|
}
|
|
|
|
|
|
|
|
return $commonSkinData;
|
|
|
|
}
|
|
|
|
|
2020-09-24 12:46:48 +00:00
|
|
|
/**
|
|
|
|
* Gets the value of the "input-location" parameter for the SearchBox Mustache template.
|
|
|
|
*
|
|
|
|
* @return string Either `Constants::SEARCH_BOX_INPUT_LOCATION_DEFAULT` or
|
|
|
|
* `Constants::SEARCH_BOX_INPUT_LOCATION_MOVED`
|
|
|
|
*/
|
2020-09-30 16:02:31 +00:00
|
|
|
private function getSearchBoxInputLocation() : string {
|
2020-09-24 12:46:48 +00:00
|
|
|
if ( $this->isLegacy() ) {
|
|
|
|
return Constants::SEARCH_BOX_INPUT_LOCATION_DEFAULT;
|
|
|
|
}
|
|
|
|
|
2020-09-30 16:02:31 +00:00
|
|
|
return Constants::SEARCH_BOX_INPUT_LOCATION_MOVED;
|
2020-09-24 12:46:48 +00:00
|
|
|
}
|
|
|
|
|
2021-01-26 23:48:20 +00:00
|
|
|
/**
|
|
|
|
* Determines whether or not the search input should expand when focused
|
|
|
|
* before WVUI search is loaded. In WVUI, the search input expands to
|
|
|
|
* accomodate thumbnails in the suggestion list. When thumbnails are
|
|
|
|
* disabled, the input should not expand. Note this is only relevant for WVUI
|
|
|
|
* search (not legacy search).
|
|
|
|
*
|
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
private function shouldSearchExpand() : bool {
|
|
|
|
$featureManager = VectorServices::getFeatureManager();
|
|
|
|
|
|
|
|
return $featureManager->isFeatureEnabled( Constants::FEATURE_USE_WVUI_SEARCH ) &&
|
|
|
|
$this->getConfig()->get( 'VectorWvuiSearchOptions' )['showThumbnail'];
|
|
|
|
}
|
|
|
|
|
2020-07-07 08:59:14 +00:00
|
|
|
/**
|
|
|
|
* Determines wheather the initial state of sidebar is visible on not
|
|
|
|
*
|
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
private function isSidebarVisible() {
|
|
|
|
$skin = $this->getSkin();
|
2020-12-18 02:51:28 +00:00
|
|
|
if ( $skin->getUser()->isRegistered() ) {
|
2020-06-30 22:39:09 +00:00
|
|
|
$userPrefSidebarState = $skin->getUser()->getOption(
|
|
|
|
Constants::PREF_KEY_SIDEBAR_VISIBLE
|
|
|
|
);
|
|
|
|
|
|
|
|
$defaultLoggedinSidebarState = $this->getConfig()->get(
|
2020-07-07 08:59:14 +00:00
|
|
|
Constants::CONFIG_KEY_DEFAULT_SIDEBAR_VISIBLE_FOR_AUTHORISED_USER
|
|
|
|
);
|
2020-06-30 22:39:09 +00:00
|
|
|
|
|
|
|
// If the sidebar user preference has been set, return that value,
|
|
|
|
// if not, then the default sidebar state for logged-in users.
|
|
|
|
return ( $userPrefSidebarState !== null )
|
|
|
|
? (bool)$userPrefSidebarState
|
|
|
|
: $defaultLoggedinSidebarState;
|
2020-07-07 08:59:14 +00:00
|
|
|
}
|
|
|
|
return $this->getConfig()->get(
|
|
|
|
Constants::CONFIG_KEY_DEFAULT_SIDEBAR_VISIBLE_FOR_ANONYMOUS_USER
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2021-03-18 11:58:55 +00:00
|
|
|
/**
|
|
|
|
* Combines class and other HTML data required to create the button
|
|
|
|
* for the languages in header feature with the existing language portletData.
|
|
|
|
*
|
|
|
|
* @param array $portletData returned by SkinMustache
|
|
|
|
* @return array enhanced $portletData
|
|
|
|
*/
|
|
|
|
private function createULSLanguageButton( $portletData ) {
|
|
|
|
$languageButtonData = [
|
|
|
|
'id' => 'p-lang-btn',
|
|
|
|
'label' => $this->msg(
|
|
|
|
'vector-language-button-label',
|
|
|
|
count( $this->getLanguagesCached() )
|
|
|
|
)->parse(),
|
|
|
|
'heading-class' =>
|
|
|
|
' vector-menu-heading ' .
|
|
|
|
' mw-ui-icon ' .
|
|
|
|
' mw-ui-icon-before ' .
|
|
|
|
' mw-ui-icon-wikimedia-language ' .
|
|
|
|
' mw-ui-button mw-ui-quiet ' .
|
|
|
|
// ext.uls.interface attaches click handler to this selector.
|
|
|
|
' mw-interlanguage-selector ',
|
|
|
|
];
|
|
|
|
return array_merge( $portletData, $languageButtonData );
|
|
|
|
}
|
|
|
|
|
2014-08-07 11:38:34 +00:00
|
|
|
/**
|
2020-09-04 19:18:57 +00:00
|
|
|
* helper for applying Vector menu classes to portlets
|
|
|
|
* @param array $portletData returned by SkinMustache to decorate
|
|
|
|
* @param int $type representing one of the menu types (see MENU_TYPE_* constants)
|
|
|
|
* @return array modified version of portletData input
|
2014-08-07 11:38:34 +00:00
|
|
|
*/
|
2020-09-04 19:18:57 +00:00
|
|
|
private function decoratePortletClass(
|
|
|
|
array $portletData,
|
|
|
|
int $type = self::MENU_TYPE_DEFAULT
|
|
|
|
) {
|
|
|
|
$extraClasses = [
|
|
|
|
self::MENU_TYPE_DROPDOWN => 'vector-menu vector-menu-dropdown',
|
|
|
|
self::MENU_TYPE_TABS => 'vector-menu vector-menu-tabs',
|
|
|
|
self::MENU_TYPE_PORTAL => 'vector-menu vector-menu-portal portal',
|
|
|
|
self::MENU_TYPE_DEFAULT => 'vector-menu',
|
2020-01-10 15:00:54 +00:00
|
|
|
];
|
2021-02-04 02:23:19 +00:00
|
|
|
$portletData['heading-class'] = 'vector-menu-heading';
|
2021-04-30 02:54:54 +00:00
|
|
|
// Add target class to apply different icon to personal menu dropdown for logged in users.
|
2021-05-06 22:54:55 +00:00
|
|
|
if ( $portletData['id'] === 'p-personal' && $this->shouldConsolidateUserLinks() &&
|
|
|
|
!$this->getUser()->isAnon()
|
|
|
|
) {
|
2021-04-30 02:54:54 +00:00
|
|
|
$portletData['heading-class'] .= ' mw-portlet-personal-page__heading--auth';
|
|
|
|
// Replace dropdown arrow with ellipsis icon if feature flag is enabled and user is logged in.
|
|
|
|
$portletData['heading-class'] .= ' mw-ui-icon mw-ui-icon-element mw-ui-icon-wikimedia-ellipsis';
|
|
|
|
}
|
2021-02-01 22:51:28 +00:00
|
|
|
if ( $portletData['id'] === 'p-lang' && $this->isLanguagesInHeader() ) {
|
2021-03-18 11:58:55 +00:00
|
|
|
$portletData = $this->createULSLanguageButton( $portletData );
|
2021-02-01 22:51:28 +00:00
|
|
|
}
|
2020-09-04 19:18:57 +00:00
|
|
|
$class = $portletData['class'];
|
|
|
|
$portletData['class'] = trim( "$class $extraClasses[$type]" );
|
|
|
|
return $portletData;
|
2014-08-07 11:38:34 +00:00
|
|
|
}
|
|
|
|
|
2020-01-14 18:47:30 +00:00
|
|
|
/**
|
2020-09-04 19:18:57 +00:00
|
|
|
* @inheritDoc
|
2020-02-14 20:33:54 +00:00
|
|
|
* @return array
|
2020-01-14 18:47:30 +00:00
|
|
|
*/
|
2020-09-04 19:18:57 +00:00
|
|
|
protected function getPortletData(
|
|
|
|
$label,
|
|
|
|
array $urls = []
|
2020-04-03 20:05:22 +00:00
|
|
|
) : array {
|
2020-09-04 19:18:57 +00:00
|
|
|
switch ( $label ) {
|
2021-04-30 02:54:54 +00:00
|
|
|
case 'user-menu':
|
2021-05-06 22:54:55 +00:00
|
|
|
$type = $this->shouldConsolidateUserLinks() && $this->getUser()->isRegistered() ?
|
2021-04-30 02:54:54 +00:00
|
|
|
self::MENU_TYPE_DROPDOWN : self::MENU_TYPE_DEFAULT;
|
|
|
|
break;
|
2020-09-04 19:18:57 +00:00
|
|
|
case 'actions':
|
|
|
|
case 'variants':
|
|
|
|
$type = self::MENU_TYPE_DROPDOWN;
|
|
|
|
break;
|
|
|
|
case 'views':
|
|
|
|
case 'namespaces':
|
|
|
|
$type = self::MENU_TYPE_TABS;
|
|
|
|
break;
|
2021-04-30 02:54:54 +00:00
|
|
|
case 'notifications':
|
2020-09-04 19:18:57 +00:00
|
|
|
case 'personal':
|
2021-04-30 02:54:54 +00:00
|
|
|
case 'user-page':
|
2020-09-04 19:18:57 +00:00
|
|
|
$type = self::MENU_TYPE_DEFAULT;
|
|
|
|
break;
|
2020-08-18 21:30:25 +00:00
|
|
|
case 'lang':
|
|
|
|
$type = $this->isLanguagesInHeader() ?
|
|
|
|
self::MENU_TYPE_DROPDOWN : self::MENU_TYPE_PORTAL;
|
|
|
|
break;
|
2020-09-04 19:18:57 +00:00
|
|
|
default:
|
|
|
|
$type = self::MENU_TYPE_PORTAL;
|
|
|
|
break;
|
|
|
|
}
|
2020-04-03 20:05:22 +00:00
|
|
|
|
2020-09-04 19:18:57 +00:00
|
|
|
$portletData = $this->decoratePortletClass(
|
|
|
|
parent::getPortletData( $label, $urls ),
|
|
|
|
$type
|
|
|
|
);
|
2019-11-18 20:23:48 +00:00
|
|
|
|
2020-09-23 22:29:30 +00:00
|
|
|
// Special casing for Variant to change label to selected.
|
|
|
|
// Hopefully we can revisit and possibly remove this code when the language switcher is moved.
|
2020-09-04 19:18:57 +00:00
|
|
|
if ( $label === 'variants' ) {
|
|
|
|
foreach ( $urls as $key => $item ) {
|
|
|
|
// Check the class of the item for a `selected` class and if so, propagate the items
|
|
|
|
// label to the main label.
|
2020-04-07 22:55:08 +00:00
|
|
|
if ( isset( $item['class'] ) && stripos( $item['class'], 'selected' ) !== false ) {
|
2020-09-04 19:18:57 +00:00
|
|
|
$portletData['label'] = $item['text'];
|
2020-04-07 22:55:08 +00:00
|
|
|
}
|
|
|
|
}
|
2020-04-03 20:05:22 +00:00
|
|
|
}
|
2020-04-07 23:21:20 +00:00
|
|
|
|
2020-09-04 19:18:57 +00:00
|
|
|
return $portletData + [
|
|
|
|
'is-dropdown' => $type === self::MENU_TYPE_DROPDOWN,
|
2020-04-03 20:05:22 +00:00
|
|
|
];
|
2019-11-18 20:23:48 +00:00
|
|
|
}
|
2014-08-07 11:38:34 +00:00
|
|
|
}
|