From 890c213366e3fb97bed918fd0b0b8f532dd697c1 Mon Sep 17 00:00:00 2001 From: Gunnar Velle Date: Wed, 27 May 2026 12:03:35 +0200 Subject: [PATCH] Use new default values from tax --- src/api/articleApi.ts | 6 ------ src/api/embedsApi.ts | 4 ---- src/api/taxonomyApi.ts | 10 ---------- src/loaders.ts | 9 +-------- src/resolvers/programmeResolvers.ts | 1 - src/resolvers/resourceResolvers.ts | 2 -- src/resolvers/subjectResolvers.ts | 4 ---- src/resolvers/taxonomyResolvers.ts | 8 -------- src/resolvers/topicResolvers.ts | 4 ---- 9 files changed, 1 insertion(+), 47 deletions(-) diff --git a/src/api/articleApi.ts b/src/api/articleApi.ts index ce5f07b5..0eb1a957 100644 --- a/src/api/articleApi.ts +++ b/src/api/articleApi.ts @@ -30,8 +30,6 @@ export const fetchTransformedContent = async ( if (params.contextId && !subjectId) { const contextNode = await context.loaders.nodesLoader.load({ contextId: params.contextId, - includeContexts: true, - filterProgrammes: true, }); const contextRootId = contextNode[0]?.context?.rootId; if (contextRootId) { @@ -68,8 +66,6 @@ export const fetchTransformedDisclaimer = async ( if (params.contextId && !subjectId) { const contextNode = await context.loaders.nodesLoader.load({ contextId: params.contextId, - includeContexts: true, - filterProgrammes: true, }); const contextRootId = contextNode[0]?.context?.rootId; if (contextRootId) { @@ -114,8 +110,6 @@ export async function fetchRelatedContent( const nodes = await context.loaders.nodesLoader.load({ contentURI: `urn:article:${related.id}`, language: context.language, - includeContexts: true, - filterProgrammes: true, }); const node = nodes?.[0]; if (node) { diff --git a/src/api/embedsApi.ts b/src/api/embedsApi.ts index db370314..2a28e84d 100644 --- a/src/api/embedsApi.ts +++ b/src/api/embedsApi.ts @@ -203,8 +203,6 @@ const contentLinkMeta: Fetch = async ({ embedData, context, const nodes = await context.loaders.nodesLoader.load({ contentURI, language: context.language, - includeContexts: true, - filterProgrammes: true, isVisible: true, }); @@ -239,8 +237,6 @@ const relatedContentMeta: Fetch = async ({ embedData, co context.loaders.nodesLoader.load({ contentURI: `urn:article:${articleId}`, language: context.language, - filterProgrammes: true, - includeContexts: true, isVisible: true, rootId: opts.subject, }), diff --git a/src/api/taxonomyApi.ts b/src/api/taxonomyApi.ts index d5297b44..72d8edeb 100644 --- a/src/api/taxonomyApi.ts +++ b/src/api/taxonomyApi.ts @@ -35,8 +35,6 @@ export async function fetchSubjectTopics(subjectId: string, context: Context): P recursive: true, nodeType: ["TOPIC"], language: context.language, - includeContexts: true, - filterProgrammes: true, }, }, }) @@ -56,8 +54,6 @@ export async function fetchNode( query: { language: context.language, isVisible: true, - includeContexts: true, - filterProgrammes: true, rootId, parentId, }, @@ -74,8 +70,6 @@ export async function searchNodes(params: { contentUris: string[] }, context: Co contentUris: params.contentUris, // TODO: This doesn't exist? // isVisible: true, - includeContexts: true, - filterProgrammes: true, page: 1, pageSize: 100, }, @@ -101,8 +95,6 @@ export async function fetchChildren( recursive: params.recursive, connectionTypes: params.connectionTypes ? [params.connectionTypes as NodeConnectionType] : undefined, isVisible: true, - includeContexts: true, - filterProgrammes: true, language: context.language, }, }, @@ -123,8 +115,6 @@ export async function fetchNodeResources(params: FetchNodeResourcesParams, conte language: context.language, relevance: params.relevance, isVisible: true, - includeContexts: true, - filterProgrammes: true, }, }, }) diff --git a/src/loaders.ts b/src/loaders.ts index f9e09d59..c8b2d14c 100644 --- a/src/loaders.ts +++ b/src/loaders.ts @@ -79,14 +79,7 @@ export function nodesLoader(context: Context): DataLoader nodes[0]) diff --git a/src/resolvers/subjectResolvers.ts b/src/resolvers/subjectResolvers.ts index 5b7e3de9..a6293923 100644 --- a/src/resolvers/subjectResolvers.ts +++ b/src/resolvers/subjectResolvers.ts @@ -39,8 +39,6 @@ export const Query = { return context.loaders.nodesLoader.load({ language: context.language, nodeType: "SUBJECT", - includeContexts: true, - filterProgrammes: true, key: input?.metadataFilterKey, value: input?.metadataFilterValue, isVisible: input?.filterVisible, @@ -58,8 +56,6 @@ export const Query = { key: "language", value: language, nodeType: "SUBJECT", - includeContexts: true, - filterProgrammes: true, }) .then((s) => s.sort((a, b) => (a.name < b.name ? -1 : 1))); }, diff --git a/src/resolvers/taxonomyResolvers.ts b/src/resolvers/taxonomyResolvers.ts index 66905df3..7ba68539 100644 --- a/src/resolvers/taxonomyResolvers.ts +++ b/src/resolvers/taxonomyResolvers.ts @@ -41,8 +41,6 @@ export const Query = { if (contextId) { const nodes = await context.loaders.nodesLoader.load({ contextId, - includeContexts: true, - filterProgrammes: true, }); if (nodes.length === 0) { throw new GraphQLError(`No node found with contextId: ${contextId}`, { @@ -66,8 +64,6 @@ export const Query = { key: metadataFilterKey, value: metadataFilterValue, isVisible: filterVisible, - includeContexts: true, - filterProgrammes: true, language: context.language, }; let nodes: Node[] = []; @@ -94,8 +90,6 @@ export const Query = { const res = await context.loaders.nodesLoader.load({ contentURI: `urn:article:${articleId}`, language: context.language, - includeContexts: true, - filterProgrammes: true, isVisible: true, }); node = res[0]; @@ -173,8 +167,6 @@ export const resolvers = { if (!url && contentUri) { const nodes = await context.loaders.nodesLoader.load({ contentURI: contentUri, - includeContexts: true, - filterProgrammes: true, isVisible: true, language: context.language, }); diff --git a/src/resolvers/topicResolvers.ts b/src/resolvers/topicResolvers.ts index be45c43a..9f9d1e4e 100644 --- a/src/resolvers/topicResolvers.ts +++ b/src/resolvers/topicResolvers.ts @@ -31,8 +31,6 @@ export const Query = { const nodes = await context.loaders.nodesLoader.load({ contentURI: contentUri, isVisible: filterVisible, - includeContexts: true, - filterProgrammes: true, language: context.language, }); return nodes.map((node) => { @@ -64,8 +62,6 @@ export const resolvers = { if (!path && contentUri) { const nodes = await context.loaders.nodesLoader.load({ contentURI: contentUri, - includeContexts: true, - filterProgrammes: true, isVisible: true, language: context.language, });