Merge branch 'main' into dina/update-logo-styling-for-advertising-par…

…tner

.stylelintrc.json

@@ -0,0 +1,69 @@
+{
+    "extends": "stylelint-config-standard-scss",
+    "ignoreFiles": [
+        "static/src/stylesheets/icons/**/*.scss",
+        "static/src/stylesheets/email/foundation-emails/**/*.scss",
+        "static/src/stylesheets/atoms/vars.scss"
+    ],
+    "rules": {
+        "selector-class-pattern": null,
+        "at-rule-empty-line-before": null,
+        "selector-pseudo-element-colon-notation": null,
+        "scss/dollar-variable-pattern": null,
+        "selector-id-pattern": null,
+        "scss/no-global-function-names": null,
+        "scss/at-rule-conditional-no-parentheses": null,
+        "value-keyword-case": null,
+        "scss/load-no-partial-leading-underscore": null,
+        "scss/at-mixin-pattern": null,
+        "scss/at-mixin-argumentless-call-parentheses": null,
+        "no-descending-specificity": null,
+        "scss/operator-no-unspaced": null,
+        "rule-empty-line-before": null,
+        "scss/dollar-variable-colon-space-after": null,
+        "no-duplicate-selectors": null,
+        "length-zero-no-unit": null,
+        "comment-whitespace-inside": null,
+        "font-family-no-missing-generic-family-keyword": null,
+        "scss/percent-placeholder-pattern": null,
+        "alpha-value-notation": null,
+        "block-no-empty": null,
+        "color-function-notation": null,
+        "color-hex-length": null,
+        "comment-empty-line-before": null,
+        "declaration-block-no-redundant-longhand-properties": null,
+        "declaration-block-no-shorthand-property-overrides": null,
+        "declaration-block-single-line-max-declarations": null,
+        "declaration-empty-line-before": null,
+        "font-family-name-quotes": null,
+        "font-family-no-duplicate-names": null,
+        "function-linear-gradient-no-nonstandard-direction": null,
+        "function-url-quotes": null,
+        "hue-degree-notation": null,
+        "keyframes-name-pattern": null,
+        "media-feature-name-no-vendor-prefix": null,
+        "media-feature-range-notation": null,
+        "named-grid-areas-no-invalid": null,
+        "no-empty-source": null,
+        "no-invalid-position-at-import-rule": null,
+        "number-max-precision": null,
+        "property-no-unknown": null,
+        "property-no-vendor-prefix": null,
+        "scss/at-else-closing-brace-newline-after": null,
+        "scss/at-else-closing-brace-space-after": null,
+        "scss/at-else-empty-line-before": null,
+        "scss/at-if-closing-brace-newline-after": null,
+        "scss/at-if-closing-brace-space-after": null,
+        "scss/at-mixin-parentheses-space-before": null,
+        "scss/comment-no-empty": null,
+        "scss/dollar-variable-empty-line-before": null,
+        "scss/double-slash-comment-empty-line-before": null,
+        "scss/double-slash-comment-whitespace-inside": null,
+        "scss/operator-no-newline-after": null,
+        "selector-attribute-quotes": null,
+        "selector-not-notation": null,
+        "selector-type-no-unknown": null,
+        "unit-no-unknown": null,
+        "value-no-vendor-prefix": null
+    }
+}

article/app/pages/StoryHtmlPage.scala

@@ -32,7 +32,7 @@ object StoryHtmlPage {
     if (pageWithStoryPackage.item.tags.isLiveBlog) {
       Html(s"<script>window.guardian.config.page.dcrCouldRender = true</script>")
     } else {
-      val thisDcrCouldRender: Boolean = dcrChecks(pageWithStoryPackage, request).values.forall(identity)
+      val thisDcrCouldRender: Boolean = dcrChecks(pageWithStoryPackage).values.forall(identity)
       Html(s"<script>window.guardian.config.page.dcrCouldRender = $thisDcrCouldRender</script>")
     }
   }

article/app/services/dotcomrendering/ArticlePicker.scala

@@ -23,15 +23,15 @@ object ArticlePageChecks {
 
 object ArticlePicker {
 
-  def dcrChecks(page: PageWithStoryPackage, request: RequestHeader): Map[String, Boolean] = {
+  def dcrChecks(page: PageWithStoryPackage): Map[String, Boolean] = {
     Map(
       ("isSupportedType", ArticlePageChecks.isSupportedType(page)),
       ("isNotAGallery", ArticlePageChecks.isNotAGallery(page)),
     )
   }
 
-  private[this] def dcrArticle100PercentPage(page: PageWithStoryPackage, request: RequestHeader): Boolean = {
-    val allowListFeatures = dcrChecks(page, request)
+  private[this] def dcrArticle100PercentPage(page: PageWithStoryPackage): Boolean = {
+    val allowListFeatures = dcrChecks(page)
     val article100PercentPageFeatures = allowListFeatures.view.filterKeys(
       Set(
         "isSupportedType",
@@ -45,14 +45,14 @@ object ArticlePicker {
   def getTier(page: PageWithStoryPackage, path: String)(implicit
       request: RequestHeader,
   ): RenderType = {
-    val checks = dcrChecks(page, request)
+    val checks = dcrChecks(page)
     val dcrCanRender = checks.values.forall(identity)
     val isNotPaidContent = ArticlePageChecks.isNotPaidContent(page)
     val shouldServePressed = PressedContent.isPressed(ensureStartingForwardSlash(path)) && isNotPaidContent
 
     val tier: RenderType = decideTier(shouldServePressed, dcrCanRender)
 
-    val isArticle100PercentPage = dcrArticle100PercentPage(page, request);
+    val isArticle100PercentPage = dcrArticle100PercentPage(page)
     val pageTones = page.article.tags.tones.map(_.id).mkString(", ")
 
     // include features that we wish to log but not allow-list against

common/app/common/configuration.scala

@@ -152,6 +152,7 @@ class GuardianConfiguration extends GuLogging {
     lazy val baseURL = configuration.getMandatoryStringProperty("rendering.baseURL")
     lazy val articleBaseURL = configuration.getMandatoryStringProperty("article-rendering.baseURL")
     lazy val faciaBaseURL = configuration.getMandatoryStringProperty("facia-rendering.baseURL")
+    lazy val tagPageBaseURL = configuration.getMandatoryStringProperty("tag-page-rendering.baseURL")
     lazy val interactiveBaseURL = configuration.getMandatoryStringProperty("interactive-rendering.baseURL")
     lazy val sentryHost = configuration.getMandatoryStringProperty("rendering.sentryHost")
     lazy val sentryPublicApiKey = configuration.getMandatoryStringProperty("rendering.sentryPublicApiKey")

common/app/conf/switches/ABTestSwitches.scala

@@ -64,4 +64,14 @@ trait ABTestSwitches {
     sellByDate = Some(LocalDate.of(2024, 6, 7)),
     exposeClientSide = true,
   )
+
+  Switch(
+    ABTests,
+    "ab-deeply-read-right-column",
+    "Add deeply read component to the right hand column",
+    owners = Seq(Owner.withEmail("[email protected]")),
+    safeState = Off,
+    sellByDate = Some(LocalDate.of(2024, 7, 31)),
+    exposeClientSide = true,
+  )
 }

common/app/conf/switches/PerformanceSwitches.scala

@@ -66,6 +66,16 @@ trait PerformanceSwitches {
     exposeClientSide = false,
   )
 
+  val CircuitBreakerDcrSwitch = Switch(
+    SwitchGroup.Performance,
+    "circuit-breaker-dcr",
+    "If this switch is switched on then the DCR API circuit breaker will be operational",
+    owners = Seq(Owner.withEmail("[email protected]")),
+    safeState = Off,
+    sellByDate = never,
+    exposeClientSide = false,
+  )
+
   val AutoRefreshSwitch = Switch(
     SwitchGroup.Performance,
     "auto-refresh",

common/app/experiments/Experiments.scala

@@ -11,7 +11,6 @@ import java.time.LocalDate
 object ActiveExperiments extends ExperimentsDefinition {
   override val allExperiments: Set[Experiment] =
     Set(
-      CommercialMegaTest,
       DarkModeWeb,
       DCRTagPages,
       DCRVideoPages,
@@ -22,36 +21,6 @@ object ActiveExperiments extends ExperimentsDefinition {
   implicit val canCheckExperiment: CanCheckExperiment = new CanCheckExperiment(this)
 }
 
-object CommercialMegaTest
-    extends Experiment(
-      name = "commercial-mega-test",
-      description = "Test the revenue effect of changes made during Q4",
-      owners = Seq(Owner.withEmail("[email protected]")),
-      sellByDate = LocalDate.of(2024, 8, 8),
-      participationGroup = Perc5A,
-    )
-
-object DCRTagPages
-    extends Experiment(
-      name = "dcr-tag-pages",
-      description = "Render tag pages with DCR",
-      owners = Seq(Owner.withGithub("[email protected]")),
-      sellByDate = LocalDate.of(2024, 5, 31),
-      participationGroup = Perc20A,
-    )
-
-object DCRVideoPages
-    extends Experiment(
-      name = "dcr-video-pages",
-      description = "Render video pages with DCR",
-      owners = Seq(
-        Owner.withGithub("[email protected]"),
-        Owner.withGithub("[email protected]"),
-      ),
-      sellByDate = LocalDate.of(2024, 5, 30),
-      participationGroup = Perc10A,
-    )
-
 object UpdatedHeaderDesign
     extends Experiment(
       name = "updated-header-design",
@@ -87,4 +56,24 @@ object UpdateLogoAdPartner
       owners = Seq(Owner.withGithub("[email protected]")),
       sellByDate = LocalDate.of(2024, 7, 30),
       participationGroup = Perc0A,
+
+object DCRVideoPages
+    extends Experiment(
+      name = "dcr-video-pages",
+      description = "Render video pages with DCR",
+      owners = Seq(
+        Owner.withGithub("[email protected]"),
+        Owner.withGithub("[email protected]"),
+      ),
+      sellByDate = LocalDate.of(2024, 5, 30),
+      participationGroup = Perc10A,
+    )
+
+object DCRTagPages
+    extends Experiment(
+      name = "dcr-tag-pages",
+      description = "Render tag pages with DCR",
+      owners = Seq(Owner.withGithub("[email protected]")),
+      sellByDate = LocalDate.of(2024, 5, 31),
+      participationGroup = Perc20A,
     )

common/app/renderers/DotcomRenderingService.scala

@@ -5,7 +5,7 @@ import com.gu.contentapi.client.model.v1.{Block, Blocks, Content}
 import common.{DCRMetrics, GuLogging}
 import concurrent.CircuitBreakerRegistry
 import conf.Configuration
-import conf.switches.Switches.CircuitBreakerSwitch
+import conf.switches.Switches.CircuitBreakerDcrSwitch
 import crosswords.CrosswordPageWithContent
 import http.{HttpPreconnections, ResultWithPreconnectPreload}
 import model.Cached.{RevalidatableResult, WithoutRevalidationResult}
@@ -133,7 +133,7 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
       }
     }
 
-    if (CircuitBreakerSwitch.isSwitchedOn) {
+    if (CircuitBreakerDcrSwitch.isSwitchedOn) {
       circuitBreaker.withCircuitBreaker(postWithoutHandler(ws, payload, endpoint, timeout)).map(handler)
     } else {
       postWithoutHandler(ws, payload, endpoint, timeout).map(handler)
@@ -292,7 +292,7 @@ class DotcomRenderingService extends GuLogging with ResultWithPreconnectPreload
     )
 
     val json = DotcomTagPagesRenderingDataModel.toJson(dataModel)
-    post(ws, json, Configuration.rendering.faciaBaseURL + "/TagPage", CacheTime.Facia)
+    post(ws, json, Configuration.rendering.tagPageBaseURL + "/TagPage", CacheTime.Facia)
   }
 
   def getInteractive(

common/conf/env/DEVINFRA.properties

@@ -117,6 +117,7 @@ rendering.endpoint=http://localhost:3030
 rendering.baseURL=http://localhost:3030
 article-rendering.baseURL=http://localhost:3030
 facia-rendering.baseURL=http://localhost:3030
+tag-page-rendering.baseURL=http://localhost:3030
 interactive-rendering.baseURL=http://localhost:3030
 misc-rendering.baseURL=http://localhost:3030