From 2a725b3a262ae6e4c20b1e158c7201e721ed8b1b Mon Sep 17 00:00:00 2001 From: David <33458145+davidmcpowell@users.noreply.github.com> Date: Wed, 24 Apr 2024 09:23:43 +0100 Subject: [PATCH] Merge pull request #18077 from overleaf/dp-teardown-share-modal-paywall-split-test Tear down project-share-modal-paywall split test GitOrigin-RevId: b85e6cdf2243a76d071607e55a33f9909f704b76 --- .../src/Features/Project/ProjectController.js | 8 - .../web/frontend/extracted-translations.json | 1 - ...-collaborators-upgrade-content-default.jsx | 48 ------ ...-collaborators-upgrade-content-variant.jsx | 57 ------- .../components/add-collaborators-upgrade.tsx | 51 ++++-- .../components/share-modal-body.tsx | 146 ++++-------------- services/web/locales/da.json | 1 - services/web/locales/de.json | 1 - services/web/locales/en.json | 1 - services/web/locales/sv.json | 1 - services/web/locales/zh-CN.json | 1 - 11 files changed, 67 insertions(+), 249 deletions(-) delete mode 100644 services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade-content-default.jsx delete mode 100644 services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade-content-variant.jsx diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js index e77df9f79d..ac94fe7bac 100644 --- a/services/web/app/src/Features/Project/ProjectController.js +++ b/services/web/app/src/Features/Project/ProjectController.js @@ -538,14 +538,6 @@ const ProjectController = { flushToTpds: cb => { TpdsProjectFlusher.flushProjectToTpdsIfNeeded(projectId, cb) }, - sharingModalSplitTest(cb) { - SplitTestHandler.getAssignment( - req, - res, - 'project-share-modal-paywall', - cb - ) - }, sharingModalNullTest(cb) { // null test targeting logged in users, for front-end side SplitTestHandler.getAssignment(req, res, 'null-test-share-modal', cb) diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json index 64a1ff150b..cedbdccf6c 100644 --- a/services/web/frontend/extracted-translations.json +++ b/services/web/frontend/extracted-translations.json @@ -772,7 +772,6 @@ "need_to_add_new_primary_before_remove": "", "need_to_leave": "", "need_to_upgrade_for_more_collabs": "", - "need_to_upgrade_for_more_collabs_variant": "", "new_compile_domain_notice": "", "new_file": "", "new_folder": "", diff --git a/services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade-content-default.jsx b/services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade-content-default.jsx deleted file mode 100644 index 25254b2acc..0000000000 --- a/services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade-content-default.jsx +++ /dev/null @@ -1,48 +0,0 @@ -import Icon from '../../../shared/components/icon' -import { useTranslation } from 'react-i18next' - -export default function AddCollaboratorsUpgradeContentDefault() { - const { t } = useTranslation() - - return ( - <> -

- {t('need_to_upgrade_for_more_collabs')}. {t('also')}: -

- - - ) -} diff --git a/services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade-content-variant.jsx b/services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade-content-variant.jsx deleted file mode 100644 index 655b38a056..0000000000 --- a/services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade-content-variant.jsx +++ /dev/null @@ -1,57 +0,0 @@ -import Icon from '../../../shared/components/icon' -import { useTranslation } from 'react-i18next' - -export default function AddCollaboratorsUpgradeContentVariant() { - const { t } = useTranslation() - - return ( - <> -
-
-

- {t('need_to_upgrade_for_more_collabs_variant')} -

-
-
-
- - -
-
- - ) -} diff --git a/services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade.tsx b/services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade.tsx index b59950fd0e..b6f9528212 100644 --- a/services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade.tsx +++ b/services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade.tsx @@ -1,13 +1,10 @@ import { useState } from 'react' import { useTranslation } from 'react-i18next' import { Button } from 'react-bootstrap' - import { useUserContext } from '../../../shared/context/user-context' - import { upgradePlan } from '../../../main/account-upgrade' import StartFreeTrialButton from '../../../shared/components/start-free-trial-button' -import AddCollaboratorsUpgradeContentDefault from './add-collaborators-upgrade-content-default' -import AddCollaboratorsUpgradeContentVariant from './add-collaborators-upgrade-content-variant' +import Icon from '../../../shared/components/icon' import { useSplitTestContext } from '../../../shared/context/split-test-context' export default function AddCollaboratorsUpgrade() { @@ -17,17 +14,47 @@ export default function AddCollaboratorsUpgrade() { const [startedFreeTrial, setStartedFreeTrial] = useState(false) const { splitTestVariants } = useSplitTestContext() - const variant = splitTestVariants['project-share-modal-paywall'] const hasNewPaywallCta = splitTestVariants['paywall-cta'] === 'enabled' return ( -
- {!variant || variant === 'default' ? ( - - ) : ( - - )} - +
+

+ {t('need_to_upgrade_for_more_collabs')}. {t('also')}: +

+
    +
  • + +   + {t('unlimited_projects')} +
    • +
  • + +   + {t('collabs_per_proj', { + collabcount: 'Multiple', + })} +
    • +
  • + +   + {t('full_doc_history')} +
    • +
  • + +   + {t('sync_to_dropbox')} +
    • +
  • + +   + {t('sync_to_github')} +
    • +
  • + +   + {t('compile_larger_projects')} +
    • +

{user.allowedFreeTrial ? ( - {isProjectOwner ? ( - <> - - - - ) : ( - - )} + return ( + <> + {isProjectOwner && } - + - {members.map(member => - isProjectOwner ? ( - - ) : ( - - ) - )} + {members.map(member => + isProjectOwner ? ( + + ) : ( + + ) + )} - {invites.map(invite => ( - - ))} + {invites.map(invite => ( + + ))} - {isProjectOwner && ( - <> -
- - - )} + {isProjectOwner ? ( + + ) : ( + + )} - {!window.ExposedSettings.recaptchaDisabled?.invite && ( - - )} - - ) - case 'new-copy-middle': - return ( - <> - - - {members.map(member => - isProjectOwner ? ( - - ) : ( - - ) - )} - - {invites.map(invite => ( - - ))} - - {isProjectOwner ? ( - - ) : ( - - )} - - {isProjectOwner && ( - <> -
- - - )} - - {!window.ExposedSettings.recaptchaDisabled?.invite && ( - - )} - - ) - case 'new-copy-bottom': - case 'default': - default: - return ( - <> - {isProjectOwner && } - - - - {members.map(member => - isProjectOwner ? ( - - ) : ( - - ) - )} - - {invites.map(invite => ( - - ))} - - {isProjectOwner ? ( - - ) : ( - - )} - - {!window.ExposedSettings.recaptchaDisabled?.invite && ( - - )} - - ) - } + {!window.ExposedSettings.recaptchaDisabled?.invite && ( + + )} + + ) } diff --git a/services/web/locales/da.json b/services/web/locales/da.json index 727390ebd9..8ad19baede 100644 --- a/services/web/locales/da.json +++ b/services/web/locales/da.json @@ -909,7 +909,6 @@ "need_to_add_new_primary_before_remove": "Du bliver nødt til at tilføje en ny primær e-mailaddresse før du kan slette denne.", "need_to_leave": "Nød til at gå?", "need_to_upgrade_for_more_collabs": "Du bliver nød til at opgradere din konto for at tilføje flere samarbejdspartnere", - "need_to_upgrade_for_more_collabs_variant": "Du har nået det maksimale antal samarbejdspartnere. Opgradér din konto for at tilføje flere.", "new_file": "Ny fil", "new_folder": "Ny mappe", "new_name": "Nyt navn", diff --git a/services/web/locales/de.json b/services/web/locales/de.json index 0ec0a0607e..0feef0bb75 100644 --- a/services/web/locales/de.json +++ b/services/web/locales/de.json @@ -903,7 +903,6 @@ "need_to_add_new_primary_before_remove": "Du musst eine neue primäre E-Mail-Adresse hinzufügen, bevor du diese entfernen kannst.", "need_to_leave": "Du musst gehen?", "need_to_upgrade_for_more_collabs": "Du musst dein Konto upgraden um mehr Mitarbeiter hinzuzufügen", - "need_to_upgrade_for_more_collabs_variant": "Du hast die maximale Anzahl an Mitbearbeitern erreicht. Führe ein Upgrade für dein Konto aus, um weitere hinzuzufügen.", "new_file": "Neue Datei", "new_folder": "Neuer Ordner", "new_name": "Neuer Name", diff --git a/services/web/locales/en.json b/services/web/locales/en.json index 1a1b9e63b2..5969a0fd84 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -1140,7 +1140,6 @@ "need_to_add_new_primary_before_remove": "You’ll need to add a new primary email address before you can remove this one.", "need_to_leave": "Need to leave?", "need_to_upgrade_for_more_collabs": "You need to upgrade your account to add more collaborators", - "need_to_upgrade_for_more_collabs_variant": "You have reached the maximum number of collaborators. Upgrade your account to add more.", "new_compile_domain_notice": "We’ve recently migrated PDF downloads to a new domain. Something might be blocking your browser from accessing that new domain, <0>__compilesUserContentDomain__. This could be caused by network blocking or a strict browser plugin rule. Please follow our <1>troubleshooting guide.", "new_file": "New File", "new_folder": "New Folder", diff --git a/services/web/locales/sv.json b/services/web/locales/sv.json index fba889418a..38a569acf4 100644 --- a/services/web/locales/sv.json +++ b/services/web/locales/sv.json @@ -549,7 +549,6 @@ "need_to_add_new_primary_before_remove": "Du måste lägga till en ny primär e-post-adress innan du kan ta bort den här.", "need_to_leave": "Vill du lämna?", "need_to_upgrade_for_more_collabs": "Du måste uppgradera ditt konto för att lägga till fler samarbetspartners", - "need_to_upgrade_for_more_collabs_variant": "Du har nått det maximala antalet medarbetare. Uppgradera ditt konto för att lägga till fler.", "new_file": "Ny fil", "new_folder": "Ny mapp", "new_name": "Nytt namn", diff --git a/services/web/locales/zh-CN.json b/services/web/locales/zh-CN.json index 146565efc1..6c5c21f1b2 100644 --- a/services/web/locales/zh-CN.json +++ b/services/web/locales/zh-CN.json @@ -1136,7 +1136,6 @@ "need_to_add_new_primary_before_remove": "在删除此电子邮件地址之前，您需要添加一个新的主电子邮件地址。", "need_to_leave": "确定要删除账号？", "need_to_upgrade_for_more_collabs": "您的账户需要升级方可添加更多的合作者", - "need_to_upgrade_for_more_collabs_variant": "您已达到协作者的最大数量。 升级您的帐户以添加更多协作者。", "new_compile_domain_notice": "我们最近将 PDF 下载迁移到了新域，可能会阻止您的浏览器访问新域 <0>__compilesUserContentDomain__。 这可能是由网络阻止或严格的浏览器插件规则引起的。 请查阅我们的<1>问题排查指南。", "new_file": "新建文件", "new_folder": "新建目录",