From 083230a3a1df96f37bd3d45918a66787efcf1cff Mon Sep 17 00:00:00 2001
From: Jonas Ege Carlsen <jonas.carlsen@knowit.no>
Date: Wed, 16 Aug 2023 13:55:52 +0200
Subject: [PATCH 1/2] Allow for one to query all fields on frontpage article
 with a single API call

---
 src/resolvers/frontpageResolvers.ts | 43 ++---------------------------
 src/schema.ts                       | 15 ++++------
 src/types/schema.d.ts               | 43 ++++++++++-------------------
 3 files changed, 22 insertions(+), 79 deletions(-)

diff --git a/src/resolvers/frontpageResolvers.ts b/src/resolvers/frontpageResolvers.ts
index 753916c9..6841d223 100644
--- a/src/resolvers/frontpageResolvers.ts
+++ b/src/resolvers/frontpageResolvers.ts
@@ -60,50 +60,13 @@ export const Query = {
 };
 
 export const resolvers = {
-  Frontpage: {
+  FrontpageMenu: {
     async article(
-      frontpage: IFrontPage,
+      menu: IFrontPage,
       _: any,
       context: ContextWithLoaders,
     ): Promise<GQLArticle> {
-      return fetchArticle(
-        {
-          articleId: `${frontpage.articleId}`,
-          convertEmbeds: true,
-        },
-        context,
-      );
-    },
-  },
-
-  Menu: {
-    async title(
-      menu: IMenu,
-      _: any,
-      context: ContextWithLoaders,
-    ): Promise<string> {
-      const article = await fetchArticle(
-        {
-          articleId: `${menu.articleId}`,
-          convertEmbeds: true,
-        },
-        context,
-      );
-      return article.title;
-    },
-    async slug(
-      menu: IMenu,
-      _: any,
-      context: ContextWithLoaders,
-    ): Promise<string> {
-      const article = await fetchArticle(
-        {
-          articleId: `${menu.articleId}`,
-          convertEmbeds: true,
-        },
-        context,
-      );
-      return article.slug || '';
+      return fetchArticle({ articleId: `${menu.articleId}` }, context);
     },
   },
 
diff --git a/src/schema.ts b/src/schema.ts
index 47b2f6dd..6618ccd7 100644
--- a/src/schema.ts
+++ b/src/schema.ts
@@ -566,15 +566,10 @@ export const typeDefs = gql`
     code: String
   }
 
-  type Menu {
-    title: String
-    slug: String
-    menu: [Menu]!
-  }
-
-  type Frontpage {
-    article: Article
-    menu: [Menu]!
+  type FrontpageMenu {
+    articleId: Int!
+    article: Article!
+    menu: [FrontpageMenu]!
   }
 
   type SubjectPageVisualElement {
@@ -1143,7 +1138,7 @@ export const typeDefs = gql`
     ): [Subject!]
     topic(id: String!, subjectId: String): Topic
     topics(contentUri: String, filterVisible: Boolean): [Topic!]
-    frontpage: Frontpage
+    frontpage: FrontpageMenu
     competenceGoals(codes: [String], language: String): [CompetenceGoal!]
     competenceGoal(code: String!, language: String): CompetenceGoal
     coreElements(codes: [String], language: String): [CoreElement!]
diff --git a/src/types/schema.d.ts b/src/types/schema.d.ts
index adcad449..03279c22 100644
--- a/src/types/schema.d.ts
+++ b/src/types/schema.d.ts
@@ -461,10 +461,11 @@ export type GQLFrontPageResources = {
   totalCount: Scalars['Int'];
 };
 
-export type GQLFrontpage = {
-  __typename?: 'Frontpage';
-  article?: Maybe<GQLArticle>;
-  menu: Array<Maybe<GQLMenu>>;
+export type GQLFrontpageMenu = {
+  __typename?: 'FrontpageMenu';
+  article: GQLArticle;
+  articleId: Scalars['Int'];
+  menu: Array<Maybe<GQLFrontpageMenu>>;
 };
 
 export type GQLFrontpageSearch = {
@@ -724,13 +725,6 @@ export type GQLManuscript = {
   manuscript: Scalars['String'];
 };
 
-export type GQLMenu = {
-  __typename?: 'Menu';
-  menu: Array<Maybe<GQLMenu>>;
-  slug?: Maybe<Scalars['String']>;
-  title?: Maybe<Scalars['String']>;
-};
-
 export type GQLMeta = {
   __typename?: 'Meta';
   availability?: Maybe<Scalars['String']>;
@@ -998,7 +992,7 @@ export type GQLQuery = {
   folderResourceMeta?: Maybe<GQLFolderResourceMeta>;
   folderResourceMetaSearch: Array<GQLFolderResourceMeta>;
   folders: Array<GQLFolder>;
-  frontpage?: Maybe<GQLFrontpage>;
+  frontpage?: Maybe<GQLFrontpageMenu>;
   frontpageSearch?: Maybe<GQLFrontpageSearch>;
   groupSearch?: Maybe<Array<GQLGroupSearch>>;
   image?: Maybe<GQLImageMetaInformationV2>;
@@ -1763,7 +1757,7 @@ export type GQLResolversTypes = {
   FolderResourceResourceType: ResolverTypeWrapper<GQLFolderResourceResourceType>;
   FootNote: ResolverTypeWrapper<GQLFootNote>;
   FrontPageResources: ResolverTypeWrapper<GQLFrontPageResources>;
-  Frontpage: ResolverTypeWrapper<GQLFrontpage>;
+  FrontpageMenu: ResolverTypeWrapper<GQLFrontpageMenu>;
   FrontpageSearch: ResolverTypeWrapper<GQLFrontpageSearch>;
   FrontpageSearchResult: ResolverTypeWrapper<GQLFrontpageSearchResult>;
   Grade: ResolverTypeWrapper<GQLGrade>;
@@ -1790,7 +1784,6 @@ export type GQLResolversTypes = {
   License: ResolverTypeWrapper<GQLLicense>;
   ListingPage: ResolverTypeWrapper<GQLListingPage>;
   Manuscript: ResolverTypeWrapper<GQLManuscript>;
-  Menu: ResolverTypeWrapper<GQLMenu>;
   Meta: ResolverTypeWrapper<GQLMeta>;
   MetaImage: ResolverTypeWrapper<GQLMetaImage>;
   Movie: ResolverTypeWrapper<GQLMovie>;
@@ -1902,7 +1895,7 @@ export type GQLResolversParentTypes = {
   FolderResourceResourceType: GQLFolderResourceResourceType;
   FootNote: GQLFootNote;
   FrontPageResources: GQLFrontPageResources;
-  Frontpage: GQLFrontpage;
+  FrontpageMenu: GQLFrontpageMenu;
   FrontpageSearch: GQLFrontpageSearch;
   FrontpageSearchResult: GQLFrontpageSearchResult;
   Grade: GQLGrade;
@@ -1929,7 +1922,6 @@ export type GQLResolversParentTypes = {
   License: GQLLicense;
   ListingPage: GQLListingPage;
   Manuscript: GQLManuscript;
-  Menu: GQLMenu;
   Meta: GQLMeta;
   MetaImage: GQLMetaImage;
   Movie: GQLMovie;
@@ -2428,9 +2420,10 @@ export type GQLFrontPageResourcesResolvers<ContextType = any, ParentType extends
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
-export type GQLFrontpageResolvers<ContextType = any, ParentType extends GQLResolversParentTypes['Frontpage'] = GQLResolversParentTypes['Frontpage']> = {
-  article?: Resolver<Maybe<GQLResolversTypes['Article']>, ParentType, ContextType>;
-  menu?: Resolver<Array<Maybe<GQLResolversTypes['Menu']>>, ParentType, ContextType>;
+export type GQLFrontpageMenuResolvers<ContextType = any, ParentType extends GQLResolversParentTypes['FrontpageMenu'] = GQLResolversParentTypes['FrontpageMenu']> = {
+  article?: Resolver<GQLResolversTypes['Article'], ParentType, ContextType>;
+  articleId?: Resolver<GQLResolversTypes['Int'], ParentType, ContextType>;
+  menu?: Resolver<Array<Maybe<GQLResolversTypes['FrontpageMenu']>>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
@@ -2691,13 +2684,6 @@ export type GQLManuscriptResolvers<ContextType = any, ParentType extends GQLReso
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 };
 
-export type GQLMenuResolvers<ContextType = any, ParentType extends GQLResolversParentTypes['Menu'] = GQLResolversParentTypes['Menu']> = {
-  menu?: Resolver<Array<Maybe<GQLResolversTypes['Menu']>>, ParentType, ContextType>;
-  slug?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
-  title?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
-  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
-};
-
 export type GQLMetaResolvers<ContextType = any, ParentType extends GQLResolversParentTypes['Meta'] = GQLResolversParentTypes['Meta']> = {
   availability?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
   id?: Resolver<GQLResolversTypes['Int'], ParentType, ContextType>;
@@ -2889,7 +2875,7 @@ export type GQLQueryResolvers<ContextType = any, ParentType extends GQLResolvers
   folderResourceMeta?: Resolver<Maybe<GQLResolversTypes['FolderResourceMeta']>, ParentType, ContextType, RequireFields<GQLQueryFolderResourceMetaArgs, 'resource'>>;
   folderResourceMetaSearch?: Resolver<Array<GQLResolversTypes['FolderResourceMeta']>, ParentType, ContextType, RequireFields<GQLQueryFolderResourceMetaSearchArgs, 'resources'>>;
   folders?: Resolver<Array<GQLResolversTypes['Folder']>, ParentType, ContextType, Partial<GQLQueryFoldersArgs>>;
-  frontpage?: Resolver<Maybe<GQLResolversTypes['Frontpage']>, ParentType, ContextType>;
+  frontpage?: Resolver<Maybe<GQLResolversTypes['FrontpageMenu']>, ParentType, ContextType>;
   frontpageSearch?: Resolver<Maybe<GQLResolversTypes['FrontpageSearch']>, ParentType, ContextType, Partial<GQLQueryFrontpageSearchArgs>>;
   groupSearch?: Resolver<Maybe<Array<GQLResolversTypes['GroupSearch']>>, ParentType, ContextType, Partial<GQLQueryGroupSearchArgs>>;
   image?: Resolver<Maybe<GQLResolversTypes['ImageMetaInformationV2']>, ParentType, ContextType, RequireFields<GQLQueryImageArgs, 'id'>>;
@@ -3311,7 +3297,7 @@ export type GQLResolvers<ContextType = any> = {
   FolderResourceResourceType?: GQLFolderResourceResourceTypeResolvers<ContextType>;
   FootNote?: GQLFootNoteResolvers<ContextType>;
   FrontPageResources?: GQLFrontPageResourcesResolvers<ContextType>;
-  Frontpage?: GQLFrontpageResolvers<ContextType>;
+  FrontpageMenu?: GQLFrontpageMenuResolvers<ContextType>;
   FrontpageSearch?: GQLFrontpageSearchResolvers<ContextType>;
   FrontpageSearchResult?: GQLFrontpageSearchResultResolvers<ContextType>;
   Grade?: GQLGradeResolvers<ContextType>;
@@ -3337,7 +3323,6 @@ export type GQLResolvers<ContextType = any> = {
   License?: GQLLicenseResolvers<ContextType>;
   ListingPage?: GQLListingPageResolvers<ContextType>;
   Manuscript?: GQLManuscriptResolvers<ContextType>;
-  Menu?: GQLMenuResolvers<ContextType>;
   Meta?: GQLMetaResolvers<ContextType>;
   MetaImage?: GQLMetaImageResolvers<ContextType>;
   Movie?: GQLMovieResolvers<ContextType>;

From 19fffda84c99e6a002aa98d7b1beb8f54bf95d4c Mon Sep 17 00:00:00 2001
From: Jonas Ege Carlsen <jonas.carlsen@knowit.no>
Date: Wed, 16 Aug 2023 13:58:13 +0200
Subject: [PATCH 2/2] Remove unused import

---
 src/resolvers/frontpageResolvers.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/resolvers/frontpageResolvers.ts b/src/resolvers/frontpageResolvers.ts
index 6841d223..4012a095 100644
--- a/src/resolvers/frontpageResolvers.ts
+++ b/src/resolvers/frontpageResolvers.ts
@@ -11,7 +11,6 @@ import {
   ISubjectPageData,
   IFilmFrontPageData,
   IMovieTheme,
-  IMenu,
 } from '@ndla/types-backend/frontpage-api';
 import { TaxonomyContext } from '@ndla/types-taxonomy';
 import {