[MIM-2051] Mim 2051 secondary subject articlelist

src/main/resources/lib/ssb/utils/articleUtils.ts

@@ -41,12 +41,21 @@ export function setupArticleListener(): void {
   })
 }
 
-export function getChildArticles(currentPath: string, subTopicId: string, start: number, count: number, sort: string) {
+export function getChildArticles(
+  currentPath: string,
+  subTopicIds: string | string[],
+  start: number,
+  count: number,
+  sort: string
+) {
   const toDay: string = new Date().toISOString()
+  const subTopics: string = `(${ensureArray(subTopicIds)
+    .map((id) => `"${id}"`)
+    .join(', ')})`
   return query<Content<Article>>({
     start: start,
     count: count,
-    query: `(_path LIKE "/content${currentPath}*" OR data.subtopic = "${subTopicId}") AND publish.from <= instant("${toDay}")`,
+    query: `(_path LIKE "/content${currentPath}*" OR data.subtopic IN ${subTopics}) AND publish.from <= instant("${toDay}")`,
     contentTypes: [`${app.name}:article`],
     sort: `publish.from ${sort}`,
   })

src/main/resources/site/parts/subjectArticleList/subjectArticleList.ts

@@ -2,12 +2,13 @@ import { type Content, type ContentsResult } from '/lib/xp/content'
 import { getContent, serviceUrl } from '/lib/xp/portal'
 import { localize } from '/lib/xp/i18n'
 import { getChildArticles, prepareArticles } from '/lib/ssb/utils/articleUtils'
+import { getSubSubjects, getSubSubjectsByPath } from '/lib/ssb/utils/subjectUtils'
 import { render } from '/lib/enonic/react4xp'
-
 import { isEnabled } from '/lib/featureToggle'
 import { type SubjectArticleListProps } from '/lib/types/partTypes/subjectArticleList'
 import { type PreparedArticles } from '/lib/types/article'
-import { type Article } from '/site/content-types'
+import { type SubjectItem } from '/lib/types/subject'
+import { type Article, type Page } from '/site/content-types'
 
 export function get(req: XP.Request) {
   return renderPart(req)
@@ -18,20 +19,21 @@ export function preview(req: XP.Request) {
 }
 
 function renderPart(req: XP.Request) {
-  const content = getContent()
+  const content = getContent<Content<Page>>()
   if (!content) throw Error('No page found')
 
-  const subTopicId: string = content._id
   const sort: string = req.params.sort ? req.params.sort : 'DESC'
   const language: string = content.language ? content.language : 'nb'
   const filterAndSortEnabled: boolean = isEnabled('articlelist-sorting', false)
   const currentPath: string = content._path
+
   // TODO change to false when crawling of articles is fixed
   const showAllArticles = true
   const start = 0
   const count: number = showAllArticles ? 100 : 10
 
-  const childArticles: ContentsResult<Content<Article>> = getChildArticles(currentPath, subTopicId, start, count, sort)
+  const subTopicIds: string | string[] = getSubtopics(content, currentPath, req, language)
+  const childArticles: ContentsResult<Content<Article>> = getChildArticles(currentPath, subTopicIds, start, count, sort)
   const preparedArticles: Array<PreparedArticles> = prepareArticles(childArticles, language)
   const totalArticles: number = childArticles.total
 
@@ -64,3 +66,19 @@ function renderPart(req: XP.Request) {
 
   return render('site/parts/subjectArticleList/subjectArticleList', props, req)
 }
+
+function getSubtopics(
+  content: Content<Page>,
+  currentPath: string,
+  req: XP.Request,
+  language: string
+): string | string[] {
+  const isMainSubject: boolean = content.page?.config?.subjectType === 'mainSubject'
+  if (isMainSubject) {
+    const allSubSubjects: SubjectItem[] = getSubSubjects(req, language)
+    const subSubjectByPath = getSubSubjectsByPath(allSubSubjects, currentPath)
+    return subSubjectByPath.map((subSubject) => subSubject.id)
+  }
+
+  return content._id
+}

src/main/resources/site/parts/subjectArticleList/subjectArticleList.xml

@@ -1,3 +1,3 @@
 <part>
-    <display-name>Artikkelopplisting for delemneside</display-name>
+    <display-name>Artikkelopplisting for emneside</display-name>
 </part>