Skip to content

Commit 3542444

Browse files
committed
Reduce subject and topic usage on ResourcePage
1 parent d5db66e commit 3542444

File tree

2 files changed

+11
-29
lines changed

2 files changed

+11
-29
lines changed

src/containers/ArticlePage/ArticlePage.tsx

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ const ArticlePage = ({
7171
const { user, authContextLoaded } = useContext(AuthContext);
7272
const { t, i18n } = useTranslation();
7373
const { trackPageView } = useTracker();
74-
const subjectPageUrl = config.ndlaFrontendDomain;
7574

7675
useEffect(() => {
7776
if (!loading && authContextLoaded) {
@@ -135,32 +134,24 @@ const ArticlePage = ({
135134
const contentType = resource ? getContentType(resource) : undefined;
136135
const resourceType = contentType && isHeroContentType(contentType) ? contentType : undefined;
137136

138-
const copyPageUrlLink = topic ? `${subjectPageUrl}${topic.path}/${resource.id.replace("urn:", "")}` : undefined;
139-
const printUrl = `${subjectPageUrl}/article-iframe/${i18n.language}/article/${resource.article.id}`;
137+
const printUrl = `${config.ndlaFrontendDomain}/article-iframe/${i18n.language}/article/${resource.article.id}`;
140138

141139
const breadcrumbItems = toBreadcrumbItems(t("breadcrumb.toFrontpage"), [...topicPath, resource]);
142140

143141
return (
144142
<main>
145-
<ArticleHero
146-
subject={subject}
147-
resourceType={resourceType}
148-
metaImage={article.metaImage}
149-
breadcrumbItems={breadcrumbItems}
150-
/>
143+
<ArticleHero resourceType={resourceType} metaImage={article.metaImage} breadcrumbItems={breadcrumbItems} />
151144
<Helmet>
152145
<title>{`${getDocumentTitle(t, resource, subject)}`}</title>
153146
{scripts?.map((script) => (
154147
<script key={script.src} src={script.src} type={script.type} async={script.async} defer={script.defer} />
155148
))}
156-
{copyPageUrlLink && (
157-
<link
158-
rel="alternate"
159-
type="application/json+oembed"
160-
href={`${config.ndlaFrontendDomain}/oembed?url=${copyPageUrlLink}`}
161-
title={article.title}
162-
/>
163-
)}
149+
<link
150+
rel="alternate"
151+
type="application/json+oembed"
152+
href={`${config.ndlaFrontendDomain}/oembed?url=${config.ndlaFrontendDomain}${resource.path}`}
153+
title={article.title}
154+
/>
164155
{subject?.metadata.customFields?.[TAXONOMY_CUSTOM_FIELD_SUBJECT_CATEGORY] ===
165156
constants.subjectCategories.ARCHIVE_SUBJECTS && <meta name="robots" content="noindex, nofollow" />}
166157
<meta name="pageid" content={`${article.id}`} />
@@ -226,9 +217,7 @@ export const articlePageFragments = {
226217
title
227218
}
228219
}
229-
...ArticleHero_Subject
230220
}
231-
${ArticleHero.fragments.subject}
232221
`,
233222
resource: gql`
234223
fragment ArticlePage_Resource on Resource {
@@ -256,7 +245,6 @@ export const articlePageFragments = {
256245
`,
257246
topic: gql`
258247
fragment ArticlePage_Topic on Topic {
259-
path
260248
...Resources_Topic
261249
}
262250
${Resources.fragments.topic}

src/containers/ArticlePage/components/ArticleHero.tsx

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { gql } from "@apollo/client";
1111
import styled from "@emotion/styled";
1212
import { stackOrder } from "@ndla/core";
1313
import { Hero, HeroContent, HeroContentType, HomeBreadcrumb, NdlaFilmHero, OneColumn } from "@ndla/ui";
14-
import { GQLArticleHero_MetaImageFragment, GQLArticleHero_SubjectFragment } from "../../../graphqlTypes";
14+
import { GQLArticleHero_MetaImageFragment } from "../../../graphqlTypes";
1515
import { Breadcrumb as BreadcrumbType } from "../../../interfaces";
1616
import { useIsNdlaFilm } from "../../../routeHelpers";
1717

@@ -52,7 +52,6 @@ const HeroBackground = styled.div`
5252
`;
5353

5454
interface Props {
55-
subject?: GQLArticleHero_SubjectFragment;
5655
resourceType?: HeroContentType;
5756
metaImage?: GQLArticleHero_MetaImageFragment;
5857
breadcrumbItems: BreadcrumbType[];
@@ -62,7 +61,7 @@ const StyledSection = styled.section`
6261
z-index: ${stackOrder.offsetSingle};
6362
`;
6463

65-
const ArticleHero = ({ resourceType, metaImage, subject, breadcrumbItems }: Props) => {
64+
const ArticleHero = ({ resourceType, metaImage, breadcrumbItems }: Props) => {
6665
const ndlaFilm = useIsNdlaFilm();
6766
return (
6867
<WrapperComponent ndlaFilm={ndlaFilm} resourceType={resourceType} metaImage={metaImage}>
@@ -74,7 +73,7 @@ const ArticleHero = ({ resourceType, metaImage, subject, breadcrumbItems }: Prop
7473
<OneColumn>
7574
<HeroContent data-image={!!(ndlaFilm && metaImage?.url)}>
7675
<StyledSection>
77-
{subject && <HomeBreadcrumb light={ndlaFilm ? true : undefined} items={breadcrumbItems} />}
76+
{<HomeBreadcrumb light={ndlaFilm ? true : undefined} items={breadcrumbItems} />}
7877
</StyledSection>
7978
</HeroContent>
8079
</OneColumn>
@@ -83,11 +82,6 @@ const ArticleHero = ({ resourceType, metaImage, subject, breadcrumbItems }: Prop
8382
};
8483

8584
ArticleHero.fragments = {
86-
subject: gql`
87-
fragment ArticleHero_Subject on Subject {
88-
id
89-
}
90-
`,
9185
metaImage: gql`
9286
fragment ArticleHero_MetaImage on MetaImage {
9387
url

0 commit comments

Comments
 (0)