Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/344723 )
Change subject: Remove Related Articles form desktop beta features
......................................................................
Remove Related Articles form desktop beta features
TODO: Config change to production should accompany this change.
Bug: T160076
Change-Id: I84da1fb33a901a6365375d00d192af35422ff0b0
---
M extension.json
M includes/FooterHooks.php
M resources/ext.relatedArticles.readMore.bootstrap/index.js
3 files changed, 2 insertions(+), 67 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedArticles
refs/changes/23/344723/1
diff --git a/extension.json b/extension.json
index e5f8202..ba10ec5 100644
--- a/extension.json
+++ b/extension.json
@@ -35,9 +35,6 @@
"RelatedArticles\\SidebarHooks::onSidebarBeforeOutput"
],
- "GetBetaFeaturePreferences": [
-
"RelatedArticles\\FooterHooks::onGetBetaFeaturePreferences"
- ],
"MakeGlobalVariablesScript": [
"RelatedArticles\\FooterHooks::onMakeGlobalVariablesScript"
],
@@ -128,7 +125,7 @@
"RelatedArticlesLoggingSamplingRate": 0.01,
"RelatedArticlesEnabledSamplingRate": 1,
"@RelatedArticlesFooterBlacklistedSkins": "List of skin names
(e.g. 'minerva') where related articles won't be shown in the footer. If absent
related articles will show in stable on Minerva or beta on all other skins.",
- "RelatedArticlesFooterBlacklistedSkins": []
+ "RelatedArticlesFooterBlacklistedSkins": [ "vector",
"monobook", "cologneblue", "minerva" ]
},
"ConfigRegistry": {
"RelatedArticles": "GlobalVarConfig::newInstance"
diff --git a/includes/FooterHooks.php b/includes/FooterHooks.php
index 775c21f..b19c91a 100644
--- a/includes/FooterHooks.php
+++ b/includes/FooterHooks.php
@@ -28,8 +28,6 @@
->makeConfig( 'RelatedArticles' );
$vars['wgRelatedArticles'] = $out->getProperty(
'RelatedArticles' );
- $vars['wgRelatedArticlesBetaFeatureEnabled'] =
- self::isUserOptedIntoBetaFeature( $out->getUser() );
$vars['wgRelatedArticlesUseCirrusSearch'] = $config->get(
'RelatedArticlesUseCirrusSearch' );
$vars['wgRelatedArticlesOnlyUseCirrusSearch'] =
$config->get( 'RelatedArticlesOnlyUseCirrusSearch' );
@@ -67,16 +65,6 @@
}
/**
- * Did the user opt into the ReadMore beta feature?
- *
- * @param User $user
- * @return bool
- */
- private static function isUserOptedIntoBetaFeature( User $user ) {
- return class_exists( 'BetaFeatures' ) &&
BetaFeatures::isFeatureEnabled( $user, 'read-more' );
- }
-
- /**
* Is ReadMore allowed on skin?
*
* The feature is allowed on all skins as long as they are not
blacklisted
@@ -92,17 +80,7 @@
->makeConfig( 'RelatedArticles' );
$blacklistedSkins = $config->get(
'RelatedArticlesFooterBlacklistedSkins' );
$skinName = $skin->getSkinName();
- $isBlacklistedSkin = in_array( $skinName, $blacklistedSkins );
-
- if ( !$isBlacklistedSkin ) {
- // Minerva has its own beta mode and doesn't use the
BetaFeatures extension.
- if ( $skinName === 'minerva' ) {
- return true;
- }
- return !class_exists( 'BetaFeatures' ) ||
self::isUserOptedIntoBetaFeature( $user );
- }
-
- return false;
+ return !in_array( $skinName, $blacklistedSkins );
}
/**
@@ -224,40 +202,4 @@
return true;
}
-
- /**
- * GetBetaFeaturePreferences hook handler
- * The beta feature is for showing ReadMore, not for showing related
- * articles in the sidebar.
- * @see
https://www.mediawiki.org/wiki/Manual:Hooks/GetBetaFeaturePreferences
- *
- * @param User $user
- * @param array $preferences
- *
- * @return bool
- */
- public static function onGetBetaFeaturePreferences( User $user, array
&$preferences ) {
- $config = MediaWikiServices::getInstance()->getConfigFactory()
- ->makeConfig( 'RelatedArticles' );
- $showReadMore = $config->get( 'RelatedArticlesShowInFooter' );
-
- if ( $showReadMore ) {
- $wgExtensionAssetsPath = $config->get(
'ExtensionAssetsPath' );
-
- $preferences['read-more'] = [
- 'label-message' =>
'relatedarticles-read-more-beta-feature-title',
- 'desc-message' =>
'relatedarticles-read-more-beta-feature-description',
- 'screenshot' => [
- 'ltr' =>
"$wgExtensionAssetsPath/RelatedArticles/images/BetaFeatures/wb-readmore-beta-ltr.svg",
- 'rtl' =>
"$wgExtensionAssetsPath/RelatedArticles/images/BetaFeatures/wb-readmore-beta-rtl.svg",
- ],
- 'info-link' =>
'https://www.mediawiki.org/wiki/Reading/Web/Projects/Read_more',
- 'discussion-link' =>
'https://www.mediawiki.org/wiki/Talk:Reading/Web/Projects/Read_more',
- ];
-
- }
-
- return true;
- }
-
}
diff --git a/resources/ext.relatedArticles.readMore.bootstrap/index.js
b/resources/ext.relatedArticles.readMore.bootstrap/index.js
index afe42f1..802e146 100644
--- a/resources/ext.relatedArticles.readMore.bootstrap/index.js
+++ b/resources/ext.relatedArticles.readMore.bootstrap/index.js
@@ -29,10 +29,6 @@
var bucket,
samplingRate = mw.config.get(
'wgRelatedArticlesEnabledSamplingRate', 1 );
- if ( mw.config.get( 'wgRelatedArticlesBetaFeatureEnabled' ) ) {
- return true;
- }
-
bucket = mw.experiments.getBucket( {
name: 'ext.relatedArticles.visibility',
enabled: true,
--
To view, visit https://gerrit.wikimedia.org/r/344723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I84da1fb33a901a6365375d00d192af35422ff0b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
