Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MIM-1894] Array from mainSubjects in PageMap #2875

Merged
merged 2 commits into from
Aug 29, 2024
Merged

[MIM-1894] Array from mainSubjects in PageMap #2875

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fe2356
mainSubjects is array now
Glenruben Aug 29, 2024
8f297a8
toString separates array elements with comma. We want newline.
Glenruben Aug 29, 2024
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
21 changes: 12 additions & 9 deletions src/main/resources/site/pages/default/default.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,20 +368,24 @@ function prepareStructuredData(metaInfo: MetaInfoData, page: DefaultPage): Artic
description: metaInfo.metaInfoDescription
? metaInfo.metaInfoDescription
: page.x['com-enonic-app-metafields']?.['meta-data']?.seoDescription || undefined,
articleSection: metaInfo.metaInfoMainSubject,
articleSection: metaInfo.metaInfoMainSubjects?.toString(),
keywords: metaInfo.metaInfoSearchKeywords,
}
}

function preparePageMap(metainfo: MetaInfoData, page: DefaultPage): string {
const keywords = metainfo.metaInfoSearchKeywords
? `<Attribute name="keywords" value="[${metainfo.metaInfoSearchKeywords}]"/>`
? `<Attribute name="keywords" value="${metainfo.metaInfoSearchKeywords}"/>`
: ''
const author = page.data.authorItemSet
? `<Attribute name="author" value="${ensureArray(page.data.authorItemSet)[0].name}"/>`
: ''
const category = metainfo.metaInfoMainSubject
? `<Attribute name="category" value="${metainfo.metaInfoMainSubject}"/>`
const category = metainfo.metaInfoMainSubjects
? metainfo.metaInfoMainSubjects
.map((subject) => {
return `<Attribute name="category" value="${subject}"/>`
})
.join('\n')
: ''
const contentType = metainfo.metaInfoSearchContentType
? `<Attribute name="contenttype" value="${metainfo.metaInfoSearchContentType}"/>`
Expand Down Expand Up @@ -421,7 +425,7 @@ function parseMetaInfoData(
let metaInfoSearchKeywords: string | undefined
let metaInfoDescription: string | undefined
let metaInfoSearchPublishFrom: string | undefined = page.publish && page.publish.from
let metaInfoMainSubject: string | undefined
let metaInfoMainSubjects: string[] | undefined
let metaInfoTitle: string | undefined =
page.x['com-enonic-app-metafields']?.['meta-data']?.seoTitle || page.displayName

Expand All @@ -448,8 +452,7 @@ function parseMetaInfoData(
}

if (page.type === `${app.name}:article` || page.type === `${app.name}:statistics`) {
const mainSubjects: string = getSubjectsPage(page, req, language.code as string).join(';')
metaInfoMainSubject = mainSubjects
metaInfoMainSubjects = getSubjectsPage(page, req, language.code as string)
}

if (page.type === `${app.name}:statistics`) {
Expand Down Expand Up @@ -477,7 +480,7 @@ function parseMetaInfoData(
metaInfoSearchKeywords,
metaInfoDescription,
metaInfoSearchPublishFrom,
metaInfoMainSubject,
metaInfoMainSubjects,
metaInfoTitle,
}
}
Expand Down Expand Up @@ -690,7 +693,7 @@ interface MetaInfoData {
metaInfoSearchKeywords: string | undefined
metaInfoDescription: string | undefined
metaInfoSearchPublishFrom: string | undefined
metaInfoMainSubject: string | undefined
metaInfoMainSubjects: string[] | undefined
metaInfoTitle: string | undefined
}

Expand Down
Loading