From 049d7573d8a2d5ad157ea993b306805531c3803b Mon Sep 17 00:00:00 2001 From: Davinder Singh Date: Mon, 24 Oct 2022 11:42:21 +0100 Subject: [PATCH] Removed the hightlight-sso-2 split test, Re-order login SSO options & remove ShareLaTeX wording (#9984) * removed the hgihlight-sso-2 split test * added the correct variant * removed the if else condition * renamed the file _registration_sso_highlight_sso_variant.pug to _registration_sso.pug * replaced with home-registration * Swapped translations and deleted one * removed shareLatex login text from login page and related translations that were being used only once in this code snippet * renamed a file name while rendering it and deleted the unsuded file. and replaced a string with error variable for message * added event segmentation back * swapped two lines * removed event-segemntation from one file GitOrigin-RevId: d99de42215e9f6034f618c47dbd47fa7a4913efa --- .../app/src/Features/StaticPages/HomeController.js | 14 +------------- services/web/app/src/Features/User/UserCreator.js | 6 ------ services/web/locales/da.json | 5 +---- services/web/locales/en.json | 5 +---- services/web/locales/fr.json | 2 -- services/web/locales/pt.json | 1 - services/web/locales/sv.json | 2 -- services/web/locales/zh-CN.json | 2 -- 8 files changed, 3 insertions(+), 34 deletions(-) diff --git a/services/web/app/src/Features/StaticPages/HomeController.js b/services/web/app/src/Features/StaticPages/HomeController.js index f1fceaf500..fcf2792bf7 100644 --- a/services/web/app/src/Features/StaticPages/HomeController.js +++ b/services/web/app/src/Features/StaticPages/HomeController.js @@ -44,30 +44,18 @@ module.exports = HomeController = { async home(req, res) { if (Features.hasFeature('homepage') && homepageExists) { try { - const highlightSSOAssignment = - await SplitTestHandler.promises.getAssignment( - req, - res, - 'highlight-sso-2' - ) const homeRegistration = await SplitTestHandler.promises.getAssignment( req, res, 'home-registration' ) - const highlightSSO = highlightSSOAssignment.variant === 'active' const removeRegistration = homeRegistration.variant return res.render('external/home/v2', { - highlightSSO, removeRegistration, }) } catch (err) { - logger.error( - { err }, - "error fetching 'highlight-sso-2' split test assignment" - ) + logger.error({ err }, err.message) return res.render('external/home/v2', { - highlightSSO: false, removeRegistration: 'default', }) } diff --git a/services/web/app/src/Features/User/UserCreator.js b/services/web/app/src/Features/User/UserCreator.js index 844f027699..88652ca4bf 100644 --- a/services/web/app/src/Features/User/UserCreator.js +++ b/services/web/app/src/Features/User/UserCreator.js @@ -38,18 +38,12 @@ async function _addAffiliation(user, affiliationOptions) { async function recordRegistrationEvent(user) { try { - const highlightSSOAssignment = - await SplitTestHandler.promises.getAssignmentForUser( - user._id, - 'highlight-sso-2' - ) const homeRegistrationAssignment = await SplitTestHandler.promises.getAssignmentForUser( user._id, 'home-registration' ) const segmentation = { - highlightSSO: highlightSSOAssignment.variant === 'active', 'home-registration': homeRegistrationAssignment.variant, } if (user.thirdPartyIdentifiers && user.thirdPartyIdentifiers.length > 0) { diff --git a/services/web/locales/da.json b/services/web/locales/da.json index 0974a7047e..ccb73cc447 100644 --- a/services/web/locales/da.json +++ b/services/web/locales/da.json @@ -178,8 +178,7 @@ "looks_like_logged_in_with_email": "Det ser ud til, at du allerede er logget ind i __appName__ med emailen __email__.", "need_to_do_this_to_access_license": "Det er nødvendigt for, at du kan drage nytte af de fordele, som følger med den site licens, som tilhører __institutionName__.", "institutional_login_not_supported": "Din institution understøtter ikke institutionel indlogning endnu, men du kan stadig blive registreret med en institutionel email.", - "institutional_login_unknown": "Beklager, vi ved ikke hvilken institution har udstedt den email–adresse. Du kan kigge i vores liste over institutioner for at finde den, eller du kan bare registrere dig med din email–adresse og kodeord her.", - "institutional_login_unknown_sso_highlight_variant": "Beklager, vi ved ikke hvilken institution har udstedt den email–adresse. Du kan kigge i vores liste over institutioner for at finde den, eller du kan bruge en af de andre muligheder herunder.", + "institutional_login_unknown": "Beklager, vi ved ikke hvilken institution har udstedt den email–adresse. Du kan kigge i vores liste over institutioner for at finde den, eller du kan bruge en af de andre muligheder herunder.", "link_account": "Forbind Konto", "link_accounts": "Forbind Kontoer", "link_accounts_and_add_email": "Forbind Kontoer og Tilføj Email", @@ -242,7 +241,6 @@ "subscription_admins_cannot_be_deleted": "Du kan ikke slette din konto med et abonnement. Du må annullere dit abonnement, før du kan fortsætte. Hvis du bliver ved med at se denne besked, så kontakt os.", "delete_acct_no_existing_pw": "Du bliver nødt til at bruge nulstillelsesformularen til at indstille et kodeord, før du kan slette din konto.", "empty_zip_file": "Zip indeholder ikke nogen filer", - "you_can_now_login_through_overleaf_sl": "Du kan nu logge ind på din ShareLaTeX–konto via Overleaf.", "find_out_more_nt": "Find ud af mere.", "register_error": "Registreringsfejl", "login_error": "Log–ind–fejl", @@ -355,7 +353,6 @@ "login_to_overleaf": "Log ind i Overleaf", "login_with_email": "Log ind med din email", "login_with_service": "Log ind med __service__", - "first_time_sl_user": "Første gang her som ShareLaTeX–bruger", "migrate_from_sl": "Migrer fra ShareLaTeX", "dont_have_account": "Ingen konto?", "sl_extra_info_tooltip": "For at flytte din konto til Overleaf må du først logge ind i ShareLaTeX. Det tager højest et par sekunder. Hvis du har et abonnement til ShareLaTeX bliver det automatisk flyttet til Overleaf.", diff --git a/services/web/locales/en.json b/services/web/locales/en.json index e1453a7a01..644d61091e 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -194,8 +194,7 @@ "looks_like_logged_in_with_email": "It looks like you’re already logged in to __appName__ with the email __email__.", "need_to_do_this_to_access_license": "You’ll need to do this in order to have access to the benefits from the __institutionName__ site license.", "institutional_login_not_supported": "Your institution doesn’t support institutional login yet, but you can still register with your institutional email.", - "institutional_login_unknown": "Sorry, we don’t know which institution issued that email address. You can browse our list of institutions to find yours, or you can just register using your email address and password here.", - "institutional_login_unknown_sso_highlight_variant": "Sorry, we don’t know which institution issued that email address. You can browse our list of institutions to find yours, or you can use one of the other options below.", + "institutional_login_unknown": "Sorry, we don’t know which institution issued that email address. You can browse our list of institutions to find yours, or you can use one of the other options below.", "link_account": "Link Account", "link_accounts": "Link Accounts", "link_accounts_and_add_email": "Link Accounts and Add Email", @@ -263,7 +262,6 @@ "subscription_admins_cannot_be_deleted": "You cannot delete your account while on a subscription. Please cancel your subscription and try again. If you keep seeing this message please contact us.", "delete_acct_no_existing_pw": "Please use the password reset form to set a password before deleting your account", "empty_zip_file": "Zip doesn’t contain any file", - "you_can_now_login_through_overleaf_sl": "You can now log in to your ShareLaTeX account through Overleaf.", "find_out_more_nt": "Find out more.", "register_error": "Registration error", "login_error": "Login error", @@ -381,7 +379,6 @@ "login_to_overleaf": "Log in to Overleaf", "login_with_email": "Log in with your email", "login_with_service": "Log in with __service__", - "first_time_sl_user": "First time here as a ShareLaTeX user", "migrate_from_sl": "Migrate from ShareLaTeX", "dont_have_account": "Don’t have an account?", "sl_extra_info_tooltip": "Please log in to ShareLaTeX to move your account to Overleaf. It will only take a few seconds. If you have a ShareLaTeX subscription, it will automatically be transferred to Overleaf.", diff --git a/services/web/locales/fr.json b/services/web/locales/fr.json index 394202137b..19a3e98cb1 100644 --- a/services/web/locales/fr.json +++ b/services/web/locales/fr.json @@ -220,7 +220,6 @@ "subscription_admins_cannot_be_deleted": "Vous ne pouvez pas supprimer votre compte car vous avez un abonnement en cours. Veuillez annuler votre abonnement et réessayer. Si vous voyez toujours ce message après lors, veuillez nous contacter.", "delete_acct_no_existing_pw": "Avant de supprimer votre compte, veuillez définir un mot de passe en utilisant le formulaire de réinitialisation de mot de passe", "empty_zip_file": "L’archive ne contient aucun fichier", - "you_can_now_login_through_overleaf_sl": "Vous pouvez désormais vous connecter à votre compte ShareLaTeX sur Overleaf.", "find_out_more_nt": "En savoir plus.", "register_error": "Erreur d’inscription", "login_error": "Erreur de connexion", @@ -328,7 +327,6 @@ "login_to_overleaf": "Se connecter à Overleaf", "login_with_email": "Se connecter avec son courriel", "login_with_service": "Se connecter avec __service__", - "first_time_sl_user": "Est-ce votre première visite en tant qu’utilisateur de ShareLaTeX ", "migrate_from_sl": "Déménager depuis ShareLaTeX", "dont_have_account": "Vous n’avez pas de compte ?", "sl_extra_info_tooltip": "Veuillez vous connecter sur ShareLaTeX pour déménager votre compte vers Overleaf. Cela ne prendra que quelques secondes. Si vous disposez d’un abonnement ShareLaTeX, celui-ci sera automatiquement transféré vers Overleaf.", diff --git a/services/web/locales/pt.json b/services/web/locales/pt.json index 03d4c9ac48..8147e5717f 100644 --- a/services/web/locales/pt.json +++ b/services/web/locales/pt.json @@ -55,7 +55,6 @@ "login_to_overleaf": "Faça o login no Overleaf", "login_with_email": "Entre com seu email", "login_with_service": "Logar com __service__", - "first_time_sl_user": "Primeira vez aqui como usuário do ShareLaTeX", "migrate_from_sl": "Migrar do ShareLaTeX", "dont_have_account": "Não tem uma conta?", "sl_extra_info_tooltip": "Por favor, faça o login no ShareLaTeX para mover sua conta para o Overleaf. Levará apenas alguns segundos. Se você tiver uma assinatura do ShareLaTeX, ela será automaticamente transferida para o Overleaf.", diff --git a/services/web/locales/sv.json b/services/web/locales/sv.json index 4c6b6cec89..e4f34b8b6f 100644 --- a/services/web/locales/sv.json +++ b/services/web/locales/sv.json @@ -178,7 +178,6 @@ "payment_provider_unreachable_error": "Tyvärr uppstod ett fel när vi kommunicerade med vår betalningsleverantör. Vänligen försök igen om ett tag.\nOm du använder några annons- eller skriptblockeringstillägg i din webbläsare kan du behöva inaktivera dem tillfälligt.", "plus_upgraded_accounts_receive": "Plus med ett uppgraderat konto får du", "empty_zip_file": "Zip-filen innehåller ingen fil", - "you_can_now_login_through_overleaf_sl": "Du kan nu logga in på ditt ShareLaTeX-konto via Overleaf.", "register_error": "Registreringsfel", "login_error": "Inloggningsfel", "more_info": "Mer info", @@ -259,7 +258,6 @@ "login_to_overleaf": "Logga in i Overleaf", "login_with_email": "Logga in med din e-post", "login_with_service": "Logga in med __service__", - "first_time_sl_user": "Första gången här som en ShareLaTeX-användare", "migrate_from_sl": "Migrera från ShareLaTeX", "dont_have_account": "Har du inget konto?", "sl_extra_info_tooltip": "Logga in på ShareLaTeX för att flytta ditt konto till Overleaf. Det tar bara några sekunder. Om du har en ShareLaTeX-prenumeration överförs den automatiskt till Overleaf.", diff --git a/services/web/locales/zh-CN.json b/services/web/locales/zh-CN.json index 486196fd2f..6bec7de64e 100644 --- a/services/web/locales/zh-CN.json +++ b/services/web/locales/zh-CN.json @@ -219,7 +219,6 @@ "subscription_admins_cannot_be_deleted": "订阅时不能删除您的帐户。请取消订阅并重试。如果您一直看到此消息,请与我们联系。", "delete_acct_no_existing_pw": "在删除您的帐户之前,请使用密码重置表单设置密码", "empty_zip_file": "Zip不包含任何文件", - "you_can_now_login_through_overleaf_sl": "您现在可以通过Overleaf登录到您的ShareLaTeX帐户。", "find_out_more_nt": "了解更多。", "register_error": "注册错误", "login_error": "登录错误", @@ -327,7 +326,6 @@ "login_to_overleaf": "登录到Overleaf", "login_with_email": "使用电子邮件登录", "login_with_service": "使用__service__登录", - "first_time_sl_user": "第一次以ShareLaTeX用户的身份出现在这里", "migrate_from_sl": "从ShareLaTeX迁移", "dont_have_account": "没有账户?", "sl_extra_info_tooltip": "请登录ShareLaTeX将您的帐户移到Overleaf。只需要几秒钟。如果您有ShareLaTeX订阅,它将自动转移到Overleaf。",