Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/api/searchApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ export async function searchWithoutPagination(
}

const transformResult = (result: MultiSearchSummaryDTO | NodeHitDTO, subjects: string[]): GQLSearchResultUnion => {
const searchCtx = result.contexts.find((c) => (subjects.length === 1 ? c.rootId === subjects[0] : c.isPrimary));
const url = searchCtx?.url ?? result.contexts?.[0]?.url;

if (result.typename === "NodeHitDTO") {
const ret: GQLNodeSearchResult = {
__typename: "NodeSearchResult",
Expand All @@ -128,14 +131,13 @@ const transformResult = (result: MultiSearchSummaryDTO | NodeHitDTO, subjects: s
supportedLanguages: [],
metaDescription: result.subjectPage?.metaDescription.metaDescription ?? "",
id: result.id,
url: result.url ?? "",
context: result.context,
url: searchCtx?.url ?? result.url ?? "",
context: searchCtx ? { ...searchCtx } : undefined,
Comment on lines +134 to +135
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kunne like gjerne hatt følgende og fått samme oppførsel

Suggested change
url: searchCtx?.url ?? result.url ?? "",
context: searchCtx ? { ...searchCtx } : undefined,
url: result.context?.url ?? result.url ?? "",
context: result.context,

contexts: result.contexts,
};
return ret;
}
const searchCtx = result.contexts.find((c) => (subjects.length === 1 ? c.rootId === subjects[0] : c.isPrimary));
const url = searchCtx?.url ?? result.contexts?.[0]?.url;

const isLearningpath = result.learningResourceType === "learningpath";
return {
...result,
Expand Down
Loading