From 453edbfe0af3039203fa93cab6e1189282781867 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 16 Nov 2023 12:55:24 +0100 Subject: [PATCH] Merge pull request #15793 from overleaf/jpa-compile-domain-cleanup [web] tear down split test for new compile domain GitOrigin-RevId: 7ab417d67e508cd95bd4e78ce7ce2a993c789dca --- .../web/app/src/Features/Compile/CompileController.js | 11 +---------- services/web/app/views/project/editor/meta.pug | 1 - services/web/config/settings.defaults.js | 3 +-- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/services/web/app/src/Features/Compile/CompileController.js b/services/web/app/src/Features/Compile/CompileController.js index f15007b960..e55df11845 100644 --- a/services/web/app/src/Features/Compile/CompileController.js +++ b/services/web/app/src/Features/Compile/CompileController.js @@ -57,16 +57,7 @@ const getSplitTestOptions = callbackify(async function (req, res) { } catch (e) {} const editorReq = { ...req, query } - const { variant: domainVariant } = - await SplitTestHandler.promises.getAssignment( - editorReq, - res, - 'pdf-download-domain' - ) - const pdfDownloadDomain = - domainVariant === 'user' && Settings.compilesUserContentDomain - ? Settings.compilesUserContentDomain - : Settings.pdfDownloadDomain + const pdfDownloadDomain = Settings.pdfDownloadDomain if (!req.query.enable_pdf_caching) { // The frontend does not want to do pdf caching. diff --git a/services/web/app/views/project/editor/meta.pug b/services/web/app/views/project/editor/meta.pug index ac4d6391b6..a012125a2f 100644 --- a/services/web/app/views/project/editor/meta.pug +++ b/services/web/app/views/project/editor/meta.pug @@ -13,7 +13,6 @@ meta(name="ol-wikiEnabled" data-type="boolean" content=settings.proxyLearn) meta(name="ol-gitBridgePublicBaseUrl" content=gitBridgePublicBaseUrl) meta(name="ol-gitBridgeEnabled" data-type="boolean" content=gitBridgeEnabled) meta(name="ol-compilesUserContentDomain" content=settings.compilesUserContentDomain) -meta(name="ol-fallbackCompileDomain" content=settings.pdfDownloadDomain) //- Set base path for Ace scripts loaded on demand/workers and don't use cdn meta(name="ol-aceBasePath" content="/js/" + lib('ace')) //- enable doc hash checking for all projects diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js index 54b8f0b5d9..226ba797b2 100644 --- a/services/web/config/settings.defaults.js +++ b/services/web/config/settings.defaults.js @@ -586,8 +586,7 @@ module.exports = { // disablePerUserCompiles: true // Domain the client (pdfjs) should download the compiled pdf from - pdfDownloadDomain: process.env.PDF_DOWNLOAD_DOMAIN, // "http://clsi-lb:3014" - compilesUserContentDomain: process.env.COMPILES_USER_CONTENT_DOMAIN, + pdfDownloadDomain: process.env.COMPILES_USER_CONTENT_DOMAIN, // "http://clsi-lb:3014" // By default turn on feature flag, can be overridden per request. enablePdfCaching: process.env.ENABLE_PDF_CACHING === 'true',