feat: add a switch

refactor the code for readability and make the iframe look better Co-Authored-By: Dom Lander <[email protected]>
guardian · Jun 12, 2024 · 98fe4b9 · 98fe4b9
1 parent c8948ec
commit 98fe4b9
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 37 deletions.
diff --git a/common/app/conf/switches/JournalismSwitches.scala b/common/app/conf/switches/JournalismSwitches.scala
@@ -1,6 +1,7 @@
 package conf.switches
 
 import conf.switches.Expiry.never
+import java.time.LocalDate
 
 trait JournalismSwitches {
 
@@ -73,4 +74,14 @@ trait JournalismSwitches {
     sellByDate = never,
     exposeClientSide = true,
   )
+
+  val Euro2024Header = Switch(
+    SwitchGroup.Journalism,
+    name = "euro-2024-header",
+    description = "Show the Euro 2024 interactive atom header on football pages",
+    owners = Seq(Owner.withEmail("[email protected]")),
+    safeState = Off,
+    sellByDate = LocalDate.of(2024, 7, 15),
+    exposeClientSide = true,
+  )
 }
diff --git a/common/app/views/fragments/atoms/interactive.scala.html b/common/app/views/fragments/atoms/interactive.scala.html
@@ -36,7 +36,7 @@
 @if(shouldFence) {
     <iframe class="interactive-atom-fence" srcdoc="@iframeBody.toString"></iframe>
 } else {
-    <figure class="interactive interactive-atom">
+    <figure class="interactive interactive-atom" style="margin: 0;">
         <style>
             @HtmlFormat.raw(interactive.css)
         </style>

diff --git a/sport/app/football/controllers/FixturesController.scala b/sport/app/football/controllers/FixturesController.scala
@@ -11,6 +11,7 @@ import java.time.LocalDate
 import pa.FootballTeam
 import play.api.mvc.{Action, AnyContent, ControllerComponents}
 import scala.concurrent.Future
+import conf.switches.Switches
 
 class FixturesController(
     val competitionsService: CompetitionsService,
@@ -86,35 +87,21 @@ class FixturesController(
 
   private def renderTagFixtures(date: LocalDate, tag: String): Action[AnyContent] =
     getTagFixtures(date, tag)
-      .map(result =>
-        Action.async { implicit request =>
-          tag match {
-            case "euro-2024" =>
-              val id = "/atom/interactive/interactives/2023/01/euros-2024/tables-euros-2024-header"
-              val edition = Edition(request)
-              contentApiClient
-                .getResponse(contentApiClient.item(id, edition))
-                .map(_.interactive.map(InteractiveAtom.make(_)))
-                .map(
-                  renderMatchList(
-                    result._1,
-                    result._2,
-                    filters,
-                    _,
-                  ),
-                )
-            case _ =>
-              Future(
-                renderMatchList(
-                  result._1,
-                  result._2,
-                  filters,
-                  None,
-                ),
-              )
+      .map {
+        case (page, fixtures) =>
+          Action.async { implicit request =>
+            tag match {
+              case "euro-2024" if Switches.Euro2024Header.isSwitchedOn =>
+                val id = "/atom/interactive/interactives/2023/01/euros-2024/tables-euros-2024-header"
+                val edition = Edition(request)
+                contentApiClient
+                  .getResponse(contentApiClient.item(id, edition))
+                  .map(_.interactive.map(InteractiveAtom.make(_)))
+                  .map(renderMatchList(page, fixtures, filters, _))
+              case _ =>
+                Future.successful(renderMatchList(page, fixtures, filters, None))
+            }
           }
-
-        },
-      )
+      }
       .getOrElse(Action(NotFound))
 }
diff --git a/sport/app/football/controllers/MatchDayController.scala b/sport/app/football/controllers/MatchDayController.scala
@@ -10,6 +10,7 @@ import contentapi.ContentApiClient
 import model.content.InteractiveAtom
 import common.ImplicitControllerExecutionContext
 import scala.concurrent.Future
+import conf.switches.Switches
 
 class MatchDayController(
     val competitionsService: CompetitionsService,
@@ -55,12 +56,14 @@ class MatchDayController(
             else s" ${competition.fullName} matches"
           val page = new FootballPage(s"football/$competitionTag/live", "football", webTitle)
           val matches = CompetitionMatchDayList(competitionsService.competitions, competition.id, date)
-          val edition = Edition(request)
-          val id = "/atom/interactive/interactives/2023/01/euros-2024/match-centre-euros-2024-header"
-          contentApiClient
-            .getResponse(contentApiClient.item(id, edition))
-            .map(_.interactive.map(InteractiveAtom.make(_)))
-            .map(renderMatchList(page, matches, filters, _))
+          if (Switches.Euro2024Header.isSwitchedOn) {
+            val id = "/atom/interactive/interactives/2023/01/euros-2024/match-centre-euros-2024-header"
+            val edition = Edition(request)
+            contentApiClient
+              .getResponse(contentApiClient.item(id, edition))
+              .map(_.interactive.map(InteractiveAtom.make(_)))
+              .map(renderMatchList(page, matches, filters, _))
+          } else Future.successful(renderMatchList(page, matches, filters, None))
         }
         .getOrElse {
           Future.successful(NotFound)

diff --git a/sport/app/football/views/matchList/matchesPage.scala.html b/sport/app/football/views/matchList/matchesPage.scala.html
@@ -14,8 +14,12 @@
 <div class="l-side-margins">
     <article id="article" class="content content--footballfixtures" itemprop="mainContentOfPage" itemtype="http://schema.org/Article" role="main">
         <div class="content__main">
+            @maybeAtom.map{ atom =>
+                <div class="gs-container">
+                    @views.html.fragments.atoms.interactive(atom, shouldFence = false)
+                </div>
+            }
             <div class="gs-container">
-                @maybeAtom.map(atom => views.html.fragments.atoms.interactive(atom, shouldFence = false))
                 <div class="content__main-column">
                     <h2 class="hide-on-mobile-if-localnav content__inline-section page-type--football">
                     @matchesList.getPageTitle(Edition(request))