refactor: only support fetching grep results with page language

src/api/searchApi.ts

@@ -148,15 +148,18 @@ const transformResult = (result: MultiSearchSummaryDTO | NodeHitDTO, subjects: s
   };
 };
 
-export const grepSearch = async (input: GrepSearchInputDTO, _context: Context): Promise<GrepSearchResultsDTO> =>
-  client.POST("/search-api/v1/search/grep", { body: input }).then(resolveJsonOATS);
+export const grepSearch = async (input: GrepSearchInputDTO, context: Context): Promise<GrepSearchResultsDTO> =>
+  client
+    .POST("/search-api/v1/search/grep", {
+      body: {
+        language: context.language,
+        ...input,
+      },
+    })
+    .then(resolveJsonOATS);
 
-export const competenceGoals = async (
-  codes: string[],
-  language: string | undefined,
-  context: Context,
-): Promise<GQLCompetenceGoal[]> => {
-  const references = await grepSearch({ language, codes, pageSize: codes.length }, context);
+export const competenceGoals = async (codes: string[], context: Context): Promise<GQLCompetenceGoal[]> => {
+  const references = await grepSearch({ codes, pageSize: codes.length }, context);
   const competenceGoals = references.results.filter((r) => {
     return r.typename === "GrepKompetansemaalDTO";
   });
@@ -198,16 +201,12 @@ export const competenceGoals = async (
   });
 };
 
-export const coreElements = async (
-  codes: string[],
-  language: string | undefined,
-  context: Context,
-): Promise<GQLCoreElement[]> => {
+export const coreElements = async (codes: string[], context: Context): Promise<GQLCoreElement[]> => {
   if (!codes.length) return [];
   const coreElementCodes = codes.filter((c) => c.startsWith("KE"));
   if (!coreElementCodes.length) return [];
 
-  const fetched = await grepSearch({ codes: coreElementCodes, language, pageSize: 100 }, context);
+  const fetched = await grepSearch({ codes: coreElementCodes, pageSize: 100 }, context);
   const coreElements = fetched.results.filter((r) => {
     return r.typename === "GrepKjerneelementDTO";
   });
@@ -234,11 +233,10 @@ export const fetchCompetenceGoalSetCodes = async (code: string, context: Context
 
 export const fetchCrossSubjectTopicsByCode = async (
   inputCodes: string[],
-  language: string | undefined,
   context: Context,
 ): Promise<GQLReference[]> => {
   const codes = inputCodes.filter((code) => code.startsWith("TT"));
-  const fetched = await grepSearch({ codes, language, pageSize: 100 }, context);
+  const fetched = await grepSearch({ codes, pageSize: 100 }, context);
   return fetched.results
     .filter((result) => result.typename === "GrepTverrfagligTemaDTO")
     .map((result) => {

src/resolvers/articleResolvers.ts

@@ -39,15 +39,7 @@ export const resolvers = {
   Article: {
     async competenceGoals(article: ArticleV2DTO, _: any, context: ContextWithLoaders): Promise<GQLCompetenceGoal[]> {
       if (!(article.grepCodes ?? []).length) return [];
-
-      const language =
-        article.supportedLanguages?.find((lang) => lang === context.language) ??
-        article.supportedLanguages?.[0] ??
-        context.language;
-      const result = await grepSearch(
-        { codes: article.grepCodes.filter((code) => code.startsWith("KM")), language: language },
-        context,
-      );
+      const result = await grepSearch({ codes: article.grepCodes.filter((code) => code.startsWith("KM")) }, context);
       return result.results.map((hit) => {
         return {
           ...hit,
@@ -58,11 +50,7 @@ export const resolvers = {
       });
     },
     async coreElements(article: ArticleV2DTO, _: any, context: ContextWithLoaders): Promise<GQLCoreElement[]> {
-      const language =
-        article.supportedLanguages?.find((lang) => lang === context.language) ??
-        article.supportedLanguages?.[0] ??
-        context.language;
-      return coreElements(article.grepCodes ?? [], language, context);
+      return coreElements(article.grepCodes ?? [], context);
     },
     async crossSubjectTopics(
       article: ArticleV2DTO,
@@ -73,11 +61,7 @@ export const resolvers = {
       if (!crossSubjectCodes.length) {
         return [];
       }
-      const language =
-        article.supportedLanguages?.find((lang) => lang === context.language) ??
-        article.supportedLanguages?.[0] ??
-        context.language;
-      const crossSubjectTopicInfo = await fetchCrossSubjectTopicsByCode(crossSubjectCodes, language, context);
+      const crossSubjectTopicInfo = await fetchCrossSubjectTopicsByCode(crossSubjectCodes, context);
       const topics = await fetchSubjectTopics(args.subjectId, context);
       return crossSubjectTopicInfo.map((crossSubjectTopic) => {
         const topic = topics.find((topic) => topic.name === crossSubjectTopic.title);

src/resolvers/curriculumResolvers.ts

@@ -12,17 +12,13 @@ import { competenceGoals, coreElements } from "../api/searchApi";
 export const Query = {
   async competenceGoals(
     _: any,
-    { codes, language }: { codes: string[]; language?: string },
+    { codes }: { codes: string[] },
     context: ContextWithLoaders,
   ): Promise<GQLCompetenceGoal[]> {
-    return competenceGoals(codes, language, context);
+    return competenceGoals(codes, context);
   },
-  async coreElements(
-    _: any,
-    { codes, language }: { codes: string[]; language?: string },
-    context: ContextWithLoaders,
-  ): Promise<GQLCoreElement[]> {
-    return coreElements(codes, language, context);
+  async coreElements(_: any, { codes }: { codes: string[] }, context: ContextWithLoaders): Promise<GQLCoreElement[]> {
+    return coreElements(codes, context);
   },
 };
 

src/schema.ts

@@ -1455,10 +1455,10 @@ export const typeDefs = gql`
     topic(id: String!, subjectId: String): Topic
     topics(contentUri: String!, filterVisible: Boolean): [Topic!]
     frontpage: FrontpageMenu
-    competenceGoals(codes: [String], language: String): [CompetenceGoal!]
-    competenceGoal(code: String!, language: String): CompetenceGoal
-    coreElements(codes: [String], language: String): [CoreElement!]
-    coreElement(code: String!, language: String): CoreElement
+    competenceGoals(codes: [String]): [CompetenceGoal!]
+    competenceGoal(code: String!): CompetenceGoal
+    coreElements(codes: [String]): [CoreElement!]
+    coreElement(code: String!): CoreElement
     search(
       query: String
       page: Int

src/types/schema.d.ts

@@ -1452,25 +1452,21 @@ export type GQLQueryAudioArgs = {
 
 export type GQLQueryCompetenceGoalArgs = {
   code: Scalars['String']['input'];
-  language?: InputMaybe<Scalars['String']['input']>;
 };
 
 
 export type GQLQueryCompetenceGoalsArgs = {
   codes?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
-  language?: InputMaybe<Scalars['String']['input']>;
 };
 
 
 export type GQLQueryCoreElementArgs = {
   code: Scalars['String']['input'];
-  language?: InputMaybe<Scalars['String']['input']>;
 };
 
 
 export type GQLQueryCoreElementsArgs = {
   codes?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
-  language?: InputMaybe<Scalars['String']['input']>;
 };