From 5d42e51d3e0dfc7c73a92f59c5df4c7eb8b1033b Mon Sep 17 00:00:00 2001 From: Antoine Clausse Date: Fri, 14 Feb 2025 13:32:08 +0100 Subject: [PATCH] Remove feature-flag `bootstrap-5-subscription` (#23114) GitOrigin-RevId: 4a8dadb7e5ae65c2651b1eeb317bb43daca881c8 --- .../Subscription/SubscriptionController.js | 19 ------------------- .../Subscription/TeamInvitesController.mjs | 13 ------------- .../canceled-subscription-react.pug | 1 - .../views/subscriptions/dashboard-react.pug | 1 - .../successful-subscription-react.pug | 1 - .../subscriptions/team/group-invites.pug | 1 - .../subscriptions/team/invite-managed.pug | 1 - .../app/views/subscriptions/team/invite.pug | 1 - .../subscriptions/team/invite_logged_out.pug | 1 - 9 files changed, 39 deletions(-) diff --git a/services/web/app/src/Features/Subscription/SubscriptionController.js b/services/web/app/src/Features/Subscription/SubscriptionController.js index 21ebd8534f..5efe2a0ed2 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionController.js +++ b/services/web/app/src/Features/Subscription/SubscriptionController.js @@ -53,14 +53,6 @@ async function userSubscriptionPage(req, res) { await SplitTestHandler.promises.getAssignment(req, res, 'pause-subscription') - // Populates splitTestVariants with a value for the split test name and allows - // Pug to read it - await SplitTestHandler.promises.getAssignment( - req, - res, - 'bootstrap-5-subscription' - ) - const { variant: flexibleLicensingVariant } = await SplitTestHandler.promises.getAssignment( req, @@ -206,12 +198,6 @@ async function successfulSubscription(req, res) { if (!personalSubscription) { res.redirect('/user/subscription/plans') } else { - await SplitTestHandler.promises.getAssignment( - req, - res, - 'bootstrap-5-subscription' - ) - res.render('subscriptions/successful-subscription-react', { title: 'thank_you', personalSubscription, @@ -305,11 +291,6 @@ function cancelSubscription(req, res, next) { * @returns {Promise} */ async function canceledSubscription(req, res, next) { - await SplitTestHandler.promises.getAssignment( - req, - res, - 'bootstrap-5-subscription' - ) return res.render('subscriptions/canceled-subscription-react', { title: 'subscription_canceled', user: SessionManager.getSessionUser(req.session), diff --git a/services/web/app/src/Features/Subscription/TeamInvitesController.mjs b/services/web/app/src/Features/Subscription/TeamInvitesController.mjs index df5abb1b12..ca508755e6 100644 --- a/services/web/app/src/Features/Subscription/TeamInvitesController.mjs +++ b/services/web/app/src/Features/Subscription/TeamInvitesController.mjs @@ -14,7 +14,6 @@ import EmailHandler from '../Email/EmailHandler.js' import { RateLimiter } from '../../infrastructure/RateLimiter.js' import Modules from '../../infrastructure/Modules.js' import UserAuditLogHandler from '../User/UserAuditLogHandler.js' -import SplitTestHandler from '../SplitTests/SplitTestHandler.js' const rateLimiters = { resendGroupInvite: new RateLimiter('resend-group-invite', { @@ -70,12 +69,6 @@ async function viewInvite(req, res, next) { const { invite, subscription } = await TeamInvitesHandler.promises.getInvite(token) - await SplitTestHandler.promises.getAssignment( - req, - res, - 'bootstrap-5-subscription' - ) - if (!invite) { return ErrorController.notFound(req, res) } @@ -192,12 +185,6 @@ async function viewInvites(req, res, next) { groupSubscription.teamInvites.find(invite => invite.email === user.email) ) - await SplitTestHandler.promises.getAssignment( - req, - res, - 'bootstrap-5-subscription' - ) - return res.render('subscriptions/team/group-invites', { teamInvites, user, diff --git a/services/web/app/views/subscriptions/canceled-subscription-react.pug b/services/web/app/views/subscriptions/canceled-subscription-react.pug index 6cc23c396b..653f75c481 100644 --- a/services/web/app/views/subscriptions/canceled-subscription-react.pug +++ b/services/web/app/views/subscriptions/canceled-subscription-react.pug @@ -2,7 +2,6 @@ extends ../layout-react block vars - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - - bootstrap5PageSplitTest = 'bootstrap-5-subscription' block entrypointVar - entrypoint = 'pages/user/subscription/canceled-subscription' diff --git a/services/web/app/views/subscriptions/dashboard-react.pug b/services/web/app/views/subscriptions/dashboard-react.pug index d39ec01a37..67380d660e 100644 --- a/services/web/app/views/subscriptions/dashboard-react.pug +++ b/services/web/app/views/subscriptions/dashboard-react.pug @@ -2,7 +2,6 @@ extends ../layout-react block vars - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - - bootstrap5PageSplitTest = 'bootstrap-5-subscription' block entrypointVar - entrypoint = 'pages/user/subscription/dashboard' diff --git a/services/web/app/views/subscriptions/successful-subscription-react.pug b/services/web/app/views/subscriptions/successful-subscription-react.pug index 1506eb9af0..e7599e816a 100644 --- a/services/web/app/views/subscriptions/successful-subscription-react.pug +++ b/services/web/app/views/subscriptions/successful-subscription-react.pug @@ -2,7 +2,6 @@ extends ../layout-react block vars - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - - bootstrap5PageSplitTest = 'bootstrap-5-subscription' block entrypointVar - entrypoint = 'pages/user/subscription/successful-subscription' diff --git a/services/web/app/views/subscriptions/team/group-invites.pug b/services/web/app/views/subscriptions/team/group-invites.pug index 2bfc74040b..cef44909eb 100644 --- a/services/web/app/views/subscriptions/team/group-invites.pug +++ b/services/web/app/views/subscriptions/team/group-invites.pug @@ -2,7 +2,6 @@ extends ../../layout-react block vars - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - - bootstrap5PageSplitTest = 'bootstrap-5-subscription' block entrypointVar - entrypoint = 'pages/user/subscription/group-invites' diff --git a/services/web/app/views/subscriptions/team/invite-managed.pug b/services/web/app/views/subscriptions/team/invite-managed.pug index 9d20d09b23..78599efb91 100644 --- a/services/web/app/views/subscriptions/team/invite-managed.pug +++ b/services/web/app/views/subscriptions/team/invite-managed.pug @@ -2,7 +2,6 @@ extends ../../layout-react block vars - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - - bootstrap5PageSplitTest = 'bootstrap-5-subscription' block entrypointVar - entrypoint = 'pages/user/subscription/invite-managed' diff --git a/services/web/app/views/subscriptions/team/invite.pug b/services/web/app/views/subscriptions/team/invite.pug index f68f3d5306..75fd131ae2 100644 --- a/services/web/app/views/subscriptions/team/invite.pug +++ b/services/web/app/views/subscriptions/team/invite.pug @@ -2,7 +2,6 @@ extends ../../layout-react block vars - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - - bootstrap5PageSplitTest = 'bootstrap-5-subscription' block entrypointVar - entrypoint = 'pages/user/subscription/invite' diff --git a/services/web/app/views/subscriptions/team/invite_logged_out.pug b/services/web/app/views/subscriptions/team/invite_logged_out.pug index 05580f6c08..e994a6ce24 100644 --- a/services/web/app/views/subscriptions/team/invite_logged_out.pug +++ b/services/web/app/views/subscriptions/team/invite_logged_out.pug @@ -2,7 +2,6 @@ extends ../../layout-react block vars - bootstrap5PageStatus = 'enabled' // One of 'disabled', 'enabled', and 'queryStringOnly' - - bootstrap5PageSplitTest = 'bootstrap-5-subscription' block append meta meta(name="ol-user" data-type="json" content=user)