From 3a00223a3637d51427ed019492e58c512651f41d Mon Sep 17 00:00:00 2001
From: Thiemo Kreuz <thiemo.kreuz@wikimedia.de>
Date: Tue, 27 Apr 2021 13:09:31 +0200
Subject: [PATCH] Separate reference preview settings in beta & non-beta

This is the smallest possible patch for a backport.

While it seems there is zero technical reason to limit user
option keys to lowercase with dashes, it's best-practice.
Same as message keys.

Bug: T281235
Change-Id: Ia4a45cf4459543c81b23b757ae9c2cfaf9676894
---
 includes/PopupsContext.php        |   8 +++++++-
 includes/PopupsHooks.php          |   6 +++---
 resources/dist/index.js           | Bin 45111 -> 45151 bytes
 resources/dist/index.js.map.json  | Bin 214884 -> 215031 bytes
 src/isReferencePreviewsEnabled.js |   7 ++++++-
 tests/phpunit/PopupsHooksTest.php |   4 ++--
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/includes/PopupsContext.php b/includes/PopupsContext.php
index 7a09fc907..699d406f9 100644
--- a/includes/PopupsContext.php
+++ b/includes/PopupsContext.php
@@ -56,6 +56,12 @@ class PopupsContext {
 	 */
 	public const PREVIEWS_OPTIN_PREFERENCE_NAME = 'popups';
 
+	/**
+	 * User preference key to enable/disable Reference Previews. Named
+	 * "mwe-popups-referencePreviews-enabled" in localStorage for anonymous users.
+	 */
+	public const REFERENCE_PREVIEWS_PREFERENCE_NAME_AFTER_BETA = 'popups-reference-previews';
+
 	/**
 	 * User preference key to enable/disable Reference Previews
 	 */
@@ -152,7 +158,7 @@ class PopupsContext {
 				self::REFERENCE_PREVIEWS_PREFERENCE_NAME
 			);
 		}
-		return $user->getBoolOption( self::REFERENCE_PREVIEWS_PREFERENCE_NAME );
+		return $user->getBoolOption( self::REFERENCE_PREVIEWS_PREFERENCE_NAME_AFTER_BETA );
 	}
 
 	/**
diff --git a/includes/PopupsHooks.php b/includes/PopupsHooks.php
index 7a2ea10f4..f96d871b8 100644
--- a/includes/PopupsHooks.php
+++ b/includes/PopupsHooks.php
@@ -131,7 +131,7 @@ class PopupsHooks {
 		}
 
 		return [
-			PopupsContext::REFERENCE_PREVIEWS_PREFERENCE_NAME => $option
+			PopupsContext::REFERENCE_PREVIEWS_PREFERENCE_NAME_AFTER_BETA => $option
 		];
 	}
 
@@ -224,7 +224,7 @@ class PopupsHooks {
 		if ( $config->get( 'PopupsReferencePreviews' ) &&
 			!$config->get( 'PopupsReferencePreviewsBetaFeature' )
 		) {
-			$defaultOptions[PopupsContext::REFERENCE_PREVIEWS_PREFERENCE_NAME] = $default;
+			$defaultOptions[PopupsContext::REFERENCE_PREVIEWS_PREFERENCE_NAME_AFTER_BETA] = $default;
 		}
 	}
 
@@ -245,7 +245,7 @@ class PopupsHooks {
 		if ( $config->get( 'PopupsReferencePreviews' ) &&
 			!$config->get( 'PopupsReferencePreviewsBetaFeature' )
 		) {
-			$user->setOption( PopupsContext::REFERENCE_PREVIEWS_PREFERENCE_NAME, $default );
+			$user->setOption( PopupsContext::REFERENCE_PREVIEWS_PREFERENCE_NAME_AFTER_BETA, $default );
 		}
 	}
 
diff --git a/resources/dist/index.js b/resources/dist/index.js
index b19f61c5656df8b82bf4cd54b5e7a5c5b20afb94..82e34429f6355a0e2b20774d43fed4870a9aae21 100644
GIT binary patch
delta 43
zcmdn~fa(4NrVS;_m=zWCCMQP7vnXlS)J)D?s>rQdl$w@Wl$w{Es=ImKvYDI!f07XS

delta 28
kcmccrfNA>!rVS;_CTA{H<Sa@}OD#&xOHSQ<Y}rgs0Lz#SU;qFB

diff --git a/resources/dist/index.js.map.json b/resources/dist/index.js.map.json
index 18499d731bcde02049086f62a56570f125e7899d..d779e4d39af9346b768df40bbc3e5788be754d9c 100644
GIT binary patch
delta 147
zcmaFT$NRmXcSGtWA8jW`&kQHiOeY;zM@Rnx4;@cOM{gYqCr58HXB}Th$1<0EPaSth
zNB8t39dDqNwuerjqhnxRkrP~{qqZ|ps>~^`dCsNwIhPo>&$+~;n>n5BDx>~%D=TKv
q>G2ATqSJR<G7C(9X8<J3%$QTSb&FEdQj1dal2diJ8{04&asvR)moD7^

delta 85
zcmV-b0IL7@j}7FG4X|a>4K_kSNp(XkO+i6&L^YFf(H;ymLP0?`Lo7={Y(i>-vC@aJ
r(gC-z(gH1MmrgbVVGwd<W@U0^ZewL|a%FaDWp|gZHUl%ZJp=a&g7P4;

diff --git a/src/isReferencePreviewsEnabled.js b/src/isReferencePreviewsEnabled.js
index 57462256b..0576d0300 100644
--- a/src/isReferencePreviewsEnabled.js
+++ b/src/isReferencePreviewsEnabled.js
@@ -33,6 +33,11 @@ export default function isReferencePreviewsEnabled( user, userSettings, config )
 		return userSettings.isReferencePreviewsEnabled();
 	}
 
+	// TODO: Remove when not in Beta any more
+	if ( config.get( 'wgPopupsReferencePreviews' ) ) {
+		return true;
+	}
+
 	// Registered users never can enable popup types at run-time.
-	return mw.user.options.get( 'popupsreferencepreviews' ) === '1' ? true : null;
+	return mw.user.options.get( 'popups-reference-previews' ) === '1' ? true : null;
 }
diff --git a/tests/phpunit/PopupsHooksTest.php b/tests/phpunit/PopupsHooksTest.php
index fd58d9a93..2211cd3a6 100644
--- a/tests/phpunit/PopupsHooksTest.php
+++ b/tests/phpunit/PopupsHooksTest.php
@@ -288,7 +288,7 @@ class PopupsHooksTest extends MediaWikiTestCase {
 		$this->assertCount( 3 - $beta, $userOptions );
 		$this->assertSame( '1', $userOptions[ PopupsContext::PREVIEWS_OPTIN_PREFERENCE_NAME ] );
 		if ( $beta === false ) {
-			$this->assertSame( '1', $userOptions[ PopupsContext::REFERENCE_PREVIEWS_PREFERENCE_NAME ] );
+			$this->assertSame( '1', $userOptions[ PopupsContext::REFERENCE_PREVIEWS_PREFERENCE_NAME_AFTER_BETA ] );
 		}
 	}
 
@@ -304,7 +304,7 @@ class PopupsHooksTest extends MediaWikiTestCase {
 			->method( 'setOption' )
 			->withConsecutive(
 				[ 'popups', $expectedState ],
-				[ 'popupsreferencepreviews', $expectedState ]
+				[ 'popups-reference-previews', $expectedState ]
 			);
 
 		$this->setMwGlobals( [