From 244d811ab25911f3764126cc3692b72bdf2b14a0 Mon Sep 17 00:00:00 2001 From: Mathias Jakobsen Date: Mon, 2 Jun 2025 11:30:15 +0100 Subject: [PATCH] Merge pull request #25938 from overleaf/mj-core-pug-teardown [web] Tear down core-pug-bs5 feature flag GitOrigin-RevId: 875417ca02d8212940b4782bc3016778344116ba --- .../Features/Collaborators/CollaboratorsInviteController.mjs | 4 ---- .../web/app/src/Features/Templates/TemplatesController.js | 4 ---- services/web/app/views/project/editor/new_from_template.pug | 2 -- services/web/app/views/project/invite/not-valid.pug | 4 ---- services/web/app/views/project/invite/show.pug | 4 ---- 5 files changed, 18 deletions(-) diff --git a/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.mjs b/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.mjs index 4c2d911709..db853afac3 100644 --- a/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.mjs +++ b/services/web/app/src/Features/Collaborators/CollaboratorsInviteController.mjs @@ -16,7 +16,6 @@ import ProjectAuditLogHandler from '../Project/ProjectAuditLogHandler.js' import Errors from '../Errors/Errors.js' import AuthenticationController from '../Authentication/AuthenticationController.js' import PrivilegeLevels from '../Authorization/PrivilegeLevels.js' -import SplitTestHandler from '../SplitTests/SplitTestHandler.js' // This rate limiter allows a different number of requests depending on the // number of callaborators a user is allowed. This is implemented by providing @@ -246,9 +245,6 @@ async function viewInvite(req, res) { const projectId = req.params.Project_id const { token } = req.params - // Read split test assignment so that it's available for Pug to read - await SplitTestHandler.promises.getAssignment(req, res, 'core-pug-bs5') - const _renderInvalidPage = function () { res.status(404) logger.debug({ projectId }, 'invite not valid, rendering not-valid page') diff --git a/services/web/app/src/Features/Templates/TemplatesController.js b/services/web/app/src/Features/Templates/TemplatesController.js index a8730a61be..39c4d50ae0 100644 --- a/services/web/app/src/Features/Templates/TemplatesController.js +++ b/services/web/app/src/Features/Templates/TemplatesController.js @@ -4,13 +4,9 @@ const TemplatesManager = require('./TemplatesManager') const ProjectHelper = require('../Project/ProjectHelper') const logger = require('@overleaf/logger') const { expressify } = require('@overleaf/promise-utils') -const SplitTestHandler = require('../SplitTests/SplitTestHandler') const TemplatesController = { async getV1Template(req, res) { - // Read split test assignment so that it's available for Pug to read - await SplitTestHandler.promises.getAssignment(req, res, 'core-pug-bs5') - const templateVersionId = req.params.Template_version_id const templateId = req.query.id if (!/^[0-9]+$/.test(templateVersionId) || !/^[0-9]+$/.test(templateId)) { diff --git a/services/web/app/views/project/editor/new_from_template.pug b/services/web/app/views/project/editor/new_from_template.pug index f2945b20f1..b1b5ae1e25 100644 --- a/services/web/app/views/project/editor/new_from_template.pug +++ b/services/web/app/views/project/editor/new_from_template.pug @@ -4,8 +4,6 @@ block vars - var suppressFooter = true - var suppressCookieBanner = true - var suppressSkipToContent = true - - bootstrap5PageStatus = 'enabled' - - bootstrap5PageSplitTest = 'core-pug-bs5' block content .editor.full-size diff --git a/services/web/app/views/project/invite/not-valid.pug b/services/web/app/views/project/invite/not-valid.pug index 693c162205..b4cbc1be1b 100644 --- a/services/web/app/views/project/invite/not-valid.pug +++ b/services/web/app/views/project/invite/not-valid.pug @@ -1,9 +1,5 @@ extends ../../layout-marketing -block vars - - bootstrap5PageStatus = 'enabled' - - bootstrap5PageSplitTest = 'core-pug-bs5' - block content main.content.content-alt#main-content .container diff --git a/services/web/app/views/project/invite/show.pug b/services/web/app/views/project/invite/show.pug index 35926977e2..a18518c716 100644 --- a/services/web/app/views/project/invite/show.pug +++ b/services/web/app/views/project/invite/show.pug @@ -1,9 +1,5 @@ extends ../../layout-marketing -block vars - - bootstrap5PageStatus = 'enabled' - - bootstrap5PageSplitTest = 'core-pug-bs5' - block content main.content.content-alt#main-content .container