Merge branch 'main' into remove-kinesis-logging

guardian · Dec 6, 2023 · 740ee3e · 740ee3e
2 parents ac61663 + 5668565
commit 740ee3e
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 1,266 deletions.
diff --git a/app/util/AtomElementBuilders.scala b/app/util/AtomElementBuilders.scala
@@ -3,7 +3,6 @@ package util
 import com.gu.contentatom.thrift.AtomData.Chart
 import com.gu.contentatom.thrift.atom.chart._
 import com.gu.contentatom.thrift.atom.cta.CTAAtom
-import com.gu.contentatom.thrift.atom.recipe.{RecipeAtom, Tags => RecipeTags, Time => RecipeTime}
 import com.gu.contentatom.thrift.atom.qanda.{QAndAAtom, QAndAItem}
 import com.gu.contentatom.thrift.atom.profile.ProfileAtom
 import com.gu.contentatom.thrift.atom.guide.GuideAtom
@@ -45,7 +44,6 @@ object AtomElementBuilders {
 
     val defaultAtoms: Map[AtomType, AtomData] = Map(
       AtomType.Cta -> AtomData.Cta(CTAAtom("-")),
-      AtomType.Recipe -> AtomData.Recipe(RecipeAtom(title, RecipeTags(), RecipeTime())),
       AtomType.Explainer -> AtomData.Explainer(ExplainerAtom(title, "-", DisplayType.Flat)),
       AtomType.Qanda -> AtomData.Qanda(QAndAAtom(Some("Q&A"), None, QAndAItem(None, "Body"))),
       AtomType.Guide -> AtomData.Guide(GuideAtom(None, None, Nil)),

diff --git a/cloudformation/DynamoTables.yml b/cloudformation/DynamoTables.yml
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -3,7 +3,7 @@ import sbt._
 
 object Dependencies {
   lazy val awsVersion = "1.11.678"
-  lazy val atomLibVersion = "1.3.2"
+  lazy val atomLibVersion = "1.4.0"
   lazy val jacksonVersion = "2.13.4"
   lazy val jacksonDatabindVersion = "2.13.4.2"
 
@@ -34,9 +34,9 @@ object Dependencies {
     "com.gu" %% "simple-configuration-ssm" % "1.5.6",
     "com.gu" %% "fezziwig" % "1.2",
     "com.gu" %% "pan-domain-auth-play_2-8" % "1.2.0",
-    "io.circe" %% "circe-parser" % "0.11.0",
+    "io.circe" %% "circe-parser" % "0.14.5",
     "net.logstash.logback" % "logstash-logback-encoder" % "6.6",
-    "com.gu" %% "content-api-client-aws" % "0.5",
-    "com.gu" %% "content-api-client" % "15.9"
+    "com.gu" %% "content-api-client-aws" % "0.7",
+    "com.gu" %% "content-api-client" % "20.0.0"
   )
 }
diff --git a/public/images/typeicons/recipe-icon.svg b/public/images/typeicons/recipe-icon.svg
diff --git a/public/js/components/AtomEdit/AtomEdit.js b/public/js/components/AtomEdit/AtomEdit.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import {PropTypes} from 'prop-types';
 import {CTAEditor} from './CustomEditors/CTAEditor';
-import {RecipeEditor} from './CustomEditors/RecipeEditor';
 import {QAndAEditor} from './CustomEditors/QAndAEditor';
 import {GuideEditor} from './CustomEditors/GuideEditor';
 import {ProfileEditor} from './CustomEditors/ProfileEditor';
@@ -80,8 +79,6 @@ class AtomEdit extends React.Component {
     switch (atomType) {
       case ("cta"):
         return <CTAEditor atom={this.props.atom} onUpdate={this.updateAtom} onFormErrorsUpdate={this.updateFormErrors} />;
-      case ("recipe"):
-        return <RecipeEditor atom={this.props.atom} onUpdate={this.updateAtom} config={this.props.config} onFormErrorsUpdate={this.updateFormErrors} />;
       case ("qanda"):
         return <QAndAEditor atom={this.props.atom} onUpdate={this.updateAtom} config={this.props.config} onFormErrorsUpdate={this.updateFormErrors} />;
       case ("guide"):

diff --git a/public/js/components/AtomEdit/CustomEditors/RecipeEditor.js b/public/js/components/AtomEdit/CustomEditors/RecipeEditor.js