Remove storyquestions atom

applications/app/controllers/AtomPageController.scala

@@ -79,8 +79,6 @@ class AtomPageController(contentApiClient: ContentApiClient, wsClient: WSClient,
     lookup(s"atom/$atomType/$id") map {
       case Left(model: MediaAtom) =>
         renderAtom(MediaAtomPage(model, withJavaScript = isJsEnabled, withVerticalScrollbar = hasVerticalScrollbar))
-      case Left(model: StoryQuestionsAtom) =>
-        renderAtom(StoryQuestionsAtomPage(model, withJavaScript = isJsEnabled, withVerticalScrollbar = hasVerticalScrollbar, inApp = inApp))
       case Left(model: GuideAtom) =>
         renderAtom(GuideAtomPage(model, withJavaScript = isJsEnabled, withVerticalScrollbar = hasVerticalScrollbar))
       case Left(model: ProfileAtom) =>
@@ -109,7 +107,6 @@ class AtomPageController(contentApiClient: ContentApiClient, wsClient: WSClient,
 
   def makeAtom(apiAtom: ItemResponse): Option[Atom] = {
     apiAtom.media.map(atom => MediaAtom.make(atom = atom)) orElse
-    apiAtom.storyquestions.map(atom => StoryQuestionsAtom.make(atom))           orElse
     apiAtom.guide.map(atom => GuideAtom.make(atom))                             orElse
     apiAtom.profile.map(atom => ProfileAtom.make(atom))                         orElse
     apiAtom.qanda.map(atom => QandaAtom.make(atom))                             orElse

commercial/test/model/hosted/HostedTrailsTest.scala

@@ -15,7 +15,6 @@ class HostedTrailsTest extends FlatSpec with Matchers {
     val interactives = None
     val recipes = None
     val reviews = None
-    val storyquestions = None
     val guides = None
     val profiles = None
     val qandas = None

common/app/model/Formats.scala

@@ -23,11 +23,6 @@ object ReviewThriftAtomFormat extends Format[com.gu.contentatom.thrift.atom.revi
   def writes(review: com.gu.contentatom.thrift.atom.review.ReviewAtom): JsObject = JsObject(Seq.empty)
 }
 
-object StoryquestionsThriftAtomFormat extends Format[com.gu.contentatom.thrift.atom.storyquestions.StoryQuestionsAtom] {
-  def reads(json: JsValue): JsError = JsError("Converting from Json is not supported by intent!")
-  def writes(storyquestions: com.gu.contentatom.thrift.atom.storyquestions.StoryQuestionsAtom): JsObject = JsObject(Seq.empty)
-}
-
 object ExplainerThriftAtomFormat extends Format[com.gu.contentatom.thrift.atom.explainer.ExplainerAtom] {
   def reads(json: JsValue): JsError = JsError("Converting from Json is not supported by intent!")
   def writes(explainer: com.gu.contentatom.thrift.atom.explainer.ExplainerAtom): JsObject = JsObject(Seq.empty)

common/app/model/content/Atoms.scala

@@ -21,7 +21,6 @@ final case class Atoms(
   interactives: Seq[InteractiveAtom],
   recipes: Seq[RecipeAtom],
   reviews: Seq[ReviewAtom],
-  storyquestions: Seq[StoryQuestionsAtom],
   explainers: Seq[ExplainerAtom],
   qandas: Seq[QandaAtom],
   guides: Seq[GuideAtom],
@@ -31,14 +30,13 @@ final case class Atoms(
   audios: Seq[AudioAtom],
   charts: Seq[ChartAtom]
 ) {
-  val all: Seq[Atom] = quizzes ++ media ++ interactives ++ recipes ++ reviews ++ storyquestions ++ explainers ++ qandas ++ guides ++ profiles ++ timelines ++ commonsdivisions ++ audios ++ charts
+  val all: Seq[Atom] = quizzes ++ media ++ interactives ++ recipes ++ reviews ++ explainers ++ qandas ++ guides ++ profiles ++ timelines ++ commonsdivisions ++ audios ++ charts
 
   def atomTypes: Map[String, Boolean] = Map(
     "guide" -> !guides.isEmpty,
     "qanda" -> !qandas.isEmpty,
     "profile" -> !profiles.isEmpty,
     "timeline" -> !timelines.isEmpty,
-    "storyquestions" -> !storyquestions.isEmpty,
     "explainer" -> !explainers.isEmpty,
     "commonsdivision" -> !commonsdivisions.isEmpty,
     "audio" -> !audios.isEmpty,
@@ -146,12 +144,6 @@ final case class ReviewAtom(
   data: atomapi.review.ReviewAtom
 ) extends Atom
 
-final case class StoryQuestionsAtom(
-  override val id: String,
-  atom: AtomApiAtom,
-  data: atomapi.storyquestions.StoryQuestionsAtom
-) extends Atom
-
 final case class ExplainerAtom(
   override val id: String,
   labels: Seq[String],
@@ -270,8 +262,6 @@ object Atoms extends common.Logging {
 
       val reviews = extract(atoms.reviews, atom => { ReviewAtom.make(atom) })
 
-      val storyquestions = extract(atoms.storyquestions, atom => { StoryQuestionsAtom.make(atom) }).filter(StoryQuestionsAtom.isOpen)
-
       val explainers = extract(atoms.explainers, atom => { ExplainerAtom.make(atom) })
 
       val qandas = extract(atoms.qandas, atom => {QandaAtom.make(atom)})
@@ -294,7 +284,6 @@ object Atoms extends common.Logging {
         interactives = interactives,
         recipes = recipes,
         reviews = reviews,
-        storyquestions = storyquestions,
         explainers = explainers,
         qandas = qandas,
         guides = guides,
@@ -561,39 +550,6 @@ object ReviewAtom {
   }
 }
 
-object StoryQuestionsAtom {
-  def make(atom: AtomApiAtom): StoryQuestionsAtom = StoryQuestionsAtom(
-    atom.id,
-    atom,
-    atom.data.asInstanceOf[AtomData.Storyquestions].storyquestions
-  )
-
-  def isOpen(question: StoryQuestionsAtom): Boolean =
-    !question.data.closeDate.exists { closeDate =>
-      closeDate < DateTime.now(DateTimeZone.UTC).getMillis
-    }
-
-  def getListId(question: StoryQuestionsAtom): Option[String] = {
-    if ("test/test" == question.data.relatedStoryId) {
-      /**
-        * TODO - remove this workaround once we've migrated to using the listId in the model.
-        *
-        * This workaround enables us to run a test for demand of receiving the answers commissioned to questions by email.
-        * If the story questions atom belongs to the test/test tag and has a label 4 characters long (an email list id) then
-        * show the form allowing a user to submit their email address and receive an answer.
-        */
-      question.atom.labels.find(_.length == 4)
-    } else {
-      for {
-        notifications <- question.data.notifications
-        email <- notifications.email
-      } yield email.listId
-    }
-  }
-
-
-}
-
 object ExplainerAtom {
   def make(atom: AtomApiAtom): ExplainerAtom = {
     val explainer = atom.data.asInstanceOf[AtomData.Explainer].explainer

common/app/model/meta.scala

@@ -444,21 +444,6 @@ case class MediaAtomPage(
   )
 }
 
-case class StoryQuestionsAtomPage(
-  override val atom: StoryQuestionsAtom,
-  override val withJavaScript: Boolean,
-  override val withVerticalScrollbar: Boolean,
-  val inApp: Boolean
-)(implicit request: RequestHeader) extends AtomPage {
-  override val atomType = "storyquestions"
-  override val body = views.html.fragments.atoms.storyquestions(atom, inApp = inApp)
-  override val metadata = MetaData.make(
-    id = atom.id,
-    webTitle = atom.atom.title.getOrElse("Story questions"),
-    section = None
-  )
-}
-
 case class GuideAtomPage(
   override val atom: GuideAtom,
   override val withJavaScript: Boolean,

common/app/views/fragments/atoms/atom.scala.html

@@ -11,7 +11,7 @@
 )(implicit request: RequestHeader, context: ApplicationContext)
 
 @import _root_.model.ShareLinkMeta
-@import _root_.model.content.{InteractiveAtom, MediaAtom, Quiz, StoryQuestionsAtom, TimelineAtom, GuideAtom, ProfileAtom, QandaAtom, ExplainerAtom, CommonsDivisionAtom, AudioAtom, ChartAtom}
+@import _root_.model.content.{InteractiveAtom, MediaAtom, Quiz, TimelineAtom, GuideAtom, ProfileAtom, QandaAtom, ExplainerAtom, CommonsDivisionAtom, AudioAtom, ChartAtom}
 @{
     model match {
         case quiz: Quiz => views.html.fragments.atoms.quiz(quiz, maybeResults = None, showResults = false, sharelinks = quiz.shareLinks)
@@ -22,7 +22,6 @@
             posterImageOverride = posterImageOverride
         )
         case interactive: InteractiveAtom => views.html.fragments.atoms.interactive(interactive, shouldFence)
-        case storyquestions: StoryQuestionsAtom => Html(ArticleAtomRenderer.getHTML(storyquestions.atom, config))
         case qanda: QandaAtom => Html(ArticleAtomRenderer.getHTML(qanda.atom, config))
         case timeline: TimelineAtom => Html(ArticleAtomRenderer.getHTML(timeline.atom, config))
         case guide: GuideAtom => Html(ArticleAtomRenderer.getHTML(guide.atom, config))

common/test/views/support/cleaner/AtomCleanerTest.scala

@@ -43,7 +43,6 @@ class AtomCleanerTest extends FlatSpec
     interactives = Nil,
     recipes = Nil,
     reviews = Nil,
-    storyquestions = Nil,
     explainers = Nil,
     qandas = Nil,
     guides = Nil,

package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.2.0",
-    "@guardian/atom-renderer": "1.0.4",
+    "@guardian/atom-renderer": "1.1.1",
     "@guardian/consent-management-platform": "1.0.2",
     "@guardian/dotcom-rendering": "git://github.com/guardian/dotcom-rendering.git#version-1-alpha",
     "bean": "~1.0.14",

project/Dependencies.scala

@@ -5,7 +5,7 @@ import sbt._
 object Dependencies {
   val identityLibVersion = "3.190"
   val awsVersion = "1.11.240"
-  val capiVersion = "15.0"
+  val capiVersion = "15.4"
   val faciaVersion = "3.0.11"
   val dispatchVersion = "0.13.1"
   val romeVersion = "1.0"
@@ -72,7 +72,7 @@ object Dependencies {
   val playJsonExtensions = "ai.x" %% "play-json-extensions" % playJsonExtensionsVersion
   val playJsonJoda = "com.typesafe.play" %% "play-json-joda" % playJsonVersion
   val playIteratees = "com.typesafe.play" %% "play-iteratees" % "2.6.1"
-  val atomRenderer = "com.gu" %% "atom-renderer" % "1.0.4"
+  val atomRenderer = "com.gu" %% "atom-renderer" % "1.1.1"
   val supportInternationalisation = "com.gu" %% "support-internationalisation" % "0.9"
   val capiAws = "com.gu" %% "content-api-client-aws" % "0.5"
   val okhttp = "com.squareup.okhttp3" % "okhttp" % "3.10.0"

static/src/javascripts/bootstraps/standard/atoms.js

@@ -111,18 +111,6 @@ const initAtoms = () => {
         );
     }
 
-    if (config.get('page.atomTypes.storyquestions')) {
-        require.ensure(
-            [],
-            require => {
-                require('@guardian/atom-renderer/dist/storyquestions/article/index.css');
-                const atomMaker = require('@guardian/atom-renderer/dist/storyquestions/article/index');
-                bootstrapAtom(atomMaker, 'storyquestions');
-            },
-            'storyquestions-atom'
-        );
-    }
-
     if (config.get('page.atomTypes.explainer')) {
         require.ensure(
             [],

static/src/javascripts/projects/commercial/modules/check-dispatcher.js

@@ -69,12 +69,6 @@ const checksToDispatch = {
         );
     },
 
-    isStoryQuestionsOnPage(): Promise<boolean> {
-        return Promise.resolve(
-            document.querySelectorAll('.js-ask-question-link').length > 0
-        );
-    },
-
     isOutbrainBlockedByAds(): Promise<boolean> {
         const dependentChecks = [
             waitForCheck('hasHighPriorityAdLoaded'),

static/src/javascripts/projects/commercial/modules/third-party-tags/outbrain.js

@@ -8,7 +8,6 @@ type OutbrainPageConditions = {
     outbrainEnabled: boolean,
     noMerchSlotsExpected: boolean,
     contributionsTestVisible: boolean,
-    storyQuestionsVisible: boolean,
 };
 
 type OutbrainDfpConditions = {
@@ -32,12 +31,10 @@ const getOutbrainPageConditions = (): Promise<OutbrainPageConditions> =>
         waitForCheck('isOutbrainDisabled'),
         noMerchSlotsExpected(),
         waitForCheck('isUserInContributionsAbTest'),
-        waitForCheck('isStoryQuestionsOnPage'),
-    ]).then(([outbrainDisabled, noMerchSlots, contributions, story]) => ({
+    ]).then(([outbrainDisabled, noMerchSlots, contributions]) => ({
         outbrainEnabled: !outbrainDisabled,
         noMerchSlotsExpected: noMerchSlots,
         contributionsTestVisible: contributions,
-        storyQuestionsVisible: story,
     }));
 
 const getOutbrainDfpConditions = (): Promise<OutbrainDfpConditions> =>
@@ -55,7 +52,6 @@ export const getOutbrainComplianceTargeting = (): Promise<
     getOutbrainPageConditions().then(pageConditions => {
         if (
             pageConditions.contributionsTestVisible ||
-            pageConditions.storyQuestionsVisible ||
             !pageConditions.outbrainEnabled
         ) {
             // This key value should be read as "the outbrain load cannot be compliant"
@@ -105,14 +101,9 @@ export const initOutbrain = (): Promise<void> =>
             'debug.outbrain.pageConditions.contributionsTestVisible',
             pageConditions.contributionsTestVisible
         );
-        config.set(
-            'debug.outbrain.pageConditions.storyQuestionsVisible',
-            pageConditions.storyQuestionsVisible
-        );
 
         const contributionVisible = pageConditions.contributionsTestVisible;
-        const editorialTests =
-            contributionVisible || pageConditions.storyQuestionsVisible;
+        const editorialTests = contributionVisible;
 
         config.set('debug.outbrain.editorialTests', editorialTests);
         config.set(