From 10ef38fe76d88c3eed4f8ec7faa0624bbae89fb5 Mon Sep 17 00:00:00 2001
From: Jessica Lawshe <jessica.lawshe@overleaf.com>
Date: Tue, 21 Jul 2020 09:28:22 -0500
Subject: [PATCH] Merge pull request #3029 from
 overleaf/jel-optimize-anti-flicker

Revert Use of ExposedSettings for Zotero experimentId

GitOrigin-RevId: 40ff3b2b4409f287c0e4630a30c0b72f70031f62
---
 services/web/app/src/Features/Project/ProjectController.js | 3 ++-
 services/web/app/src/infrastructure/ExpressLocals.js       | 1 -
 services/web/app/views/layout.pug                          | 2 +-
 services/web/app/views/project/editor.pug                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js
index b206463522..dc2c258099 100644
--- a/services/web/app/src/Features/Project/ProjectController.js
+++ b/services/web/app/src/Features/Project/ProjectController.js
@@ -838,7 +838,8 @@ const ProjectController = {
               wsUrl,
               showSupport: Features.hasFeature('support'),
               gaOptimize: enableOptimize,
-              customOptimizeEvent: true
+              customOptimizeEvent: true,
+              experimentId: Settings.experimentId
             })
             timer.done()
           }
diff --git a/services/web/app/src/infrastructure/ExpressLocals.js b/services/web/app/src/infrastructure/ExpressLocals.js
index 914632912d..9ec9a1c0e2 100644
--- a/services/web/app/src/infrastructure/ExpressLocals.js
+++ b/services/web/app/src/infrastructure/ExpressLocals.js
@@ -354,7 +354,6 @@ module.exports = function(webRouter, privateApiRouter, publicApiRouter) {
 
   webRouter.use(function(req, res, next) {
     res.locals.ExposedSettings = {
-      experimentId: Settings.experimentId,
       isOverleaf: Settings.overleaf != null,
       appName: Settings.appName,
       hasSamlBeta: req.session.samlBeta,
diff --git a/services/web/app/views/layout.pug b/services/web/app/views/layout.pug
index 986291a5fa..f25d41aa3d 100644
--- a/services/web/app/views/layout.pug
+++ b/services/web/app/views/layout.pug
@@ -45,7 +45,7 @@ html(
 				if !customOptimizeEvent
 					script(type='text/javascript').
 						ga('send', 'event', 'pageview',  document.title.substring(0, 499), window.location.href.substring(0, 499))
-				if !ExposedSettings.experimentId
+				if !experimentId
 					//- Anti-flicker snippet
 					//- Only run for tests controlled by Optimize editor
 					style(type='text/css') .async-hide { opacity: 0 !important}
diff --git a/services/web/app/views/project/editor.pug b/services/web/app/views/project/editor.pug
index 81f2b61e08..1f705fe26e 100644
--- a/services/web/app/views/project/editor.pug
+++ b/services/web/app/views/project/editor.pug
@@ -153,7 +153,7 @@ block content
 	//- We need to do .replace(/\//g, '\\/') do that '</script>' -> '<\/script>'
 	//- and doesn't prematurely end the script tag.
 	script#data(type="application/json").
-		!{StringHelper.stringifyJsonForScript({ userSettings: userSettings, user: user, trackChangesState: trackChangesState, useV2History: useV2History, enabledLinkedFileTypes: settings.enabledLinkedFileTypes, brandVariation: brandVariation })}
+		!{StringHelper.stringifyJsonForScript({ userSettings: userSettings, user: user, trackChangesState: trackChangesState, useV2History: useV2History, enabledLinkedFileTypes: settings.enabledLinkedFileTypes, brandVariation: brandVariation, experimentId: experimentId })}
 
 	script(type='text/javascript').
 		window.data = JSON.parse(document.querySelector("#data").text);