From 053640ed2cd0c05d4a5f6c0cea34d7b5d1cf214a Mon Sep 17 00:00:00 2001
From: Katrine Wist <katrinew0702@gmail.com>
Date: Tue, 5 Sep 2023 15:56:44 +0200
Subject: [PATCH] Add language to content and title in Article

---
 src/api/articleApi.ts | 16 +++++++++-------
 src/schema.ts         |  9 +++++++--
 src/types/schema.d.ts | 23 +++++++++++++++++++----
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/api/articleApi.ts b/src/api/articleApi.ts
index 69559d7e..e6f53ff0 100644
--- a/src/api/articleApi.ts
+++ b/src/api/articleApi.ts
@@ -86,16 +86,18 @@ const _fetchTransformedArticle = async (
       ...article,
       introduction: article.introduction?.introduction ?? '',
       metaDescription: article.metaDescription.metaDescription,
-      title: article.title.title,
       metaData,
       tags: article.tags.tags,
       visualElementEmbed,
-      content:
-        article.articleType === 'standard'
-          ? content
-          : content === '<section></section>'
-          ? ''
-          : content,
+      content: {
+        ...article.content,
+        content:
+          article.articleType === 'standard'
+            ? content
+            : content === '<section></section>'
+            ? ''
+            : content,
+      },
       visualElement,
     };
   }
diff --git a/src/schema.ts b/src/schema.ts
index 03a31d56..eae5b94f 100644
--- a/src/schema.ts
+++ b/src/schema.ts
@@ -486,13 +486,18 @@ export const typeDefs = gql`
     url: String!
   }
 
+  type Content {
+    content: String!
+    language: String!
+  }
+
   type Article {
     id: Int!
     revision: Int!
-    title: String!
+    title: Title!
     slug: String
     introduction: String
-    content: String!
+    content: Content!
     created: String!
     updated: String!
     published: String!
diff --git a/src/types/schema.d.ts b/src/types/schema.d.ts
index 3a561728..6fb366ee 100644
--- a/src/types/schema.d.ts
+++ b/src/types/schema.d.ts
@@ -30,7 +30,7 @@ export type GQLArticle = {
   competenceGoals?: Maybe<Array<GQLCompetenceGoal>>;
   conceptIds?: Maybe<Array<Scalars['Int']>>;
   concepts?: Maybe<Array<GQLConcept>>;
-  content: Scalars['String'];
+  content: GQLContent;
   copyright: GQLCopyright;
   coreElements?: Maybe<Array<GQLCoreElement>>;
   created: Scalars['String'];
@@ -51,7 +51,7 @@ export type GQLArticle = {
   slug?: Maybe<Scalars['String']>;
   supportedLanguages?: Maybe<Array<Scalars['String']>>;
   tags?: Maybe<Array<Scalars['String']>>;
-  title: Scalars['String'];
+  title: GQLTitle;
   updated: Scalars['String'];
   visualElement?: Maybe<GQLVisualElement>;
   visualElementEmbed?: Maybe<GQLResourceEmbed>;
@@ -319,6 +319,12 @@ export type GQLConfigMetaRestricted = {
   value: Scalars['String'];
 };
 
+export type GQLContent = {
+  __typename?: 'Content';
+  content: Scalars['String'];
+  language: Scalars['String'];
+};
+
 export type GQLContributor = {
   __typename?: 'Contributor';
   name: Scalars['String'];
@@ -1745,6 +1751,7 @@ export type GQLResolversTypes = {
   ConceptLicense: ResolverTypeWrapper<GQLConceptLicense>;
   ConceptResult: ResolverTypeWrapper<GQLConceptResult>;
   ConfigMetaRestricted: ResolverTypeWrapper<GQLConfigMetaRestricted>;
+  Content: ResolverTypeWrapper<GQLContent>;
   Contributor: ResolverTypeWrapper<GQLContributor>;
   Copyright: ResolverTypeWrapper<GQLCopyright>;
   CoreElement: ResolverTypeWrapper<GQLCoreElement>;
@@ -1883,6 +1890,7 @@ export type GQLResolversParentTypes = {
   ConceptLicense: GQLConceptLicense;
   ConceptResult: GQLConceptResult;
   ConfigMetaRestricted: GQLConfigMetaRestricted;
+  Content: GQLContent;
   Contributor: GQLContributor;
   Copyright: GQLCopyright;
   CoreElement: GQLCoreElement;
@@ -2005,7 +2013,7 @@ export type GQLArticleResolvers<ContextType = any, ParentType extends GQLResolve
   competenceGoals?: Resolver<Maybe<Array<GQLResolversTypes['CompetenceGoal']>>, ParentType, ContextType>;
   conceptIds?: Resolver<Maybe<Array<GQLResolversTypes['Int']>>, ParentType, ContextType>;
   concepts?: Resolver<Maybe<Array<GQLResolversTypes['Concept']>>, ParentType, ContextType>;
-  content?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
+  content?: Resolver<GQLResolversTypes['Content'], ParentType, ContextType>;
   copyright?: Resolver<GQLResolversTypes['Copyright'], ParentType, ContextType>;
   coreElements?: Resolver<Maybe<Array<GQLResolversTypes['CoreElement']>>, ParentType, ContextType>;
   created?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
@@ -2026,7 +2034,7 @@ export type GQLArticleResolvers<ContextType = any, ParentType extends GQLResolve
   slug?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
   supportedLanguages?: Resolver<Maybe<Array<GQLResolversTypes['String']>>, ParentType, ContextType>;
   tags?: Resolver<Maybe<Array<GQLResolversTypes['String']>>, ParentType, ContextType>;
-  title?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
+  title?: Resolver<GQLResolversTypes['Title'], ParentType, ContextType>;
   updated?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
   visualElement?: Resolver<Maybe<GQLResolversTypes['VisualElement']>, ParentType, ContextType>;
   visualElementEmbed?: Resolver<Maybe<GQLResolversTypes['ResourceEmbed']>, ParentType, ContextType>;
@@ -2290,6 +2298,12 @@ export type GQLConfigMetaRestrictedResolvers<ContextType = any, ParentType exten
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
+export type GQLContentResolvers<ContextType = any, ParentType extends GQLResolversParentTypes['Content'] = GQLResolversParentTypes['Content']> = {
+  content?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
+  language?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
 export type GQLContributorResolvers<ContextType = any, ParentType extends GQLResolversParentTypes['Contributor'] = GQLResolversParentTypes['Contributor']> = {
   name?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
   type?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
@@ -3288,6 +3302,7 @@ export type GQLResolvers<ContextType = any> = {
   ConceptLicense?: GQLConceptLicenseResolvers<ContextType>;
   ConceptResult?: GQLConceptResultResolvers<ContextType>;
   ConfigMetaRestricted?: GQLConfigMetaRestrictedResolvers<ContextType>;
+  Content?: GQLContentResolvers<ContextType>;
   Contributor?: GQLContributorResolvers<ContextType>;
   Copyright?: GQLCopyrightResolvers<ContextType>;
   CoreElement?: GQLCoreElementResolvers<ContextType>;