Skip to content
Open
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hat-ring-components",
"version": "4.6.2",
"version": "4.6.3",
"description": "Head App Template - RING components",
"license": "MIT",
"repository": {},
Expand Down
14 changes: 7 additions & 7 deletions src/helpers/UtilsHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,25 +51,25 @@ export function UtilsHelper_getCurrentPageType(context) {
return isHomePage ? SiteContentType.Homepage : (context.siteContentType || null);
}


export function UtilsHelper_getCurrentNodeName(context) {
try {
const content = context?.hatControllerParams?.gqlResponse?.data?.site?.data?.content;
if (content) {
const pageType = UtilsHelper_getCurrentPageType(context);

const pageType = UtilsHelper_getCurrentPageType(context);
if (pageType === SiteContentType.SiteNode) {
// @TODO: getting name for sitenode/category in HAT Server?
const slug = content.slug?.replaceAll('-', ' ') || '';
return (slug.charAt(0).toUpperCase() + slug.slice(1)) || '';
const categoryName = _.get(context, 'hatControllerParams.gqlResponse.data.site.data.node.category.data.name', '');
if (categoryName) return categoryName;
const slug = content.slug || '';
return _.capitalize(UtilsHelper_slugify(slug));
} else if (pageType === SiteContentType.Story) {
return content.title || '';
} else if (pageType === SiteContentType.CustomAction) {
return content.action || '';
} else if ([SiteContentType.Source, SiteContentType.Topic].includes(pageType)) {
return content.name || '';
} else if (pageType === SiteContentType.Author) {
// @TODO: get author name in HAT Server
return '';
return content.name || '';
}
}
} catch (e) {
Expand Down
3 changes: 3 additions & 0 deletions src/helpers/seo/SeoHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@ export async function SeoHelper_getSeoCurrentPageType(context) {


export async function SeoHelper_authorName(context) {
const authorNameFromContext = _.get(context, 'hatControllerParams.gqlResponse.data.site.data.content.name', '');
if (authorNameFromContext) return authorNameFromContext;

const query = gql`
query($uuid: UUID){
author(id:$uuid){
Expand Down
12 changes: 10 additions & 2 deletions src/helpers/seo/SeoTitleHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {WebsiteApiProvider} from "../../providers/WebsiteApiProvider";
import {gql} from "graphql-tag";
import _ from "lodash";
import {SeoHelper_getSeoCurrentPageType} from "./SeoHelper";
import {UtilsHelper_getDomain} from "../UtilsHelper";
import {UtilsHelper_getDomain, UtilsHelper_slugify} from "../UtilsHelper";

/**
* Helper for handling titles according to the SEO requirements based on the placement of the usage
Expand Down Expand Up @@ -90,11 +90,15 @@ export async function SeoTitleHelper_pageTitle(context, place: string) {
}

async function getCategoryName() {
const categoryNameFromContext = _.get(context, 'hatControllerParams.gqlResponse.data.site.data.node.category.data.name', '');
if (categoryNameFromContext) return categoryNameFromContext;

const nodeQuery = gql`
query($url: URL!, $variant:ID!){
site(url:$url, variantId: $variant){
data {
node {
slug
category {
data{
name
Expand All @@ -111,7 +115,11 @@ export async function SeoTitleHelper_pageTitle(context, place: string) {
variant: context.websiteManagerVariant,
});

return _.get(nodeResponse, 'data.site.data.node.category.data.name', '');
const categoryName = _.get(nodeResponse, 'data.site.data.node.category.data.name', '');
if (categoryName) return categoryName;

const slug = _.get(nodeResponse, 'data.site.data.node.slug', '');
return _.capitalize(UtilsHelper_slugify(slug));
}

async function prepareCategoryTitle() {
Expand Down