@newskit-render/core 1.79.1 → 1.79.2-alpha.0

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.79.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.79.1-alpha.0...@newskit-render/core@1.79.1) (2022-08-01)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
 # [1.79.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.79.0-alpha.0...@newskit-render/core@1.79.0) (2022-07-28)
 
 **Note:** Version bump only for package @newskit-render/core

package/README.md

@@ -27,7 +27,6 @@ npm start
 In order to run the application,we need the following required environment variables.
 
 ```
-SITE_HOST=""
 NEWSKIT_API_ENV_URL=""
 NEWSKIT_API_X_API_KEY=""
 OKTA_CLIENT_ID=""

package/__tests__/pages/[articleSlug].test.tsx

@@ -54,9 +54,9 @@ const props: ArticleSlug = {
       ],
     },
   },
-  articleURL: 'hostname/section/test-1/slugche' as URL,
+  articleURL: 'https://hostname/section/test-1/slugche' as URL,
   twitterUsername: 'D_Trump',
-  siteHost: 'hostname',
+  siteHost: 'https://hostname',
   gscId: '4320982',
   articleId: 'test-1',
 }
@@ -69,7 +69,7 @@ const user = {
   subscriptions: [{ endDate: null }],
 }
 jest.mock('swr')
-const swrMock = useSWR as jest.Mock
+let swrMock
 
 jest.mock('next/router', () => {
   return {
@@ -78,7 +78,6 @@ jest.mock('next/router', () => {
 })
 
 jest.mock('../../config', () => ({
-  siteHost: 'hostname',
   twitterUsername: 'D_Trump',
   gscId: '4320982',
 }))
@@ -131,7 +130,7 @@ describe('Article', () => {
           section: 'section',
           articleSlug: 'slugche',
         },
-        req: { headers: { cookie: 'some-cookie' } },
+        req: { headers: { cookie: 'some-cookie', host: 'hostname' } },
         res: { setHeader: setHeaderMock },
       })
       expect(response).toEqual({ props: { ...props, showAds: true, user } })
@@ -144,6 +143,9 @@ describe('Article', () => {
 })
 
 describe('Recommendation', () => {
+  beforeEach(() => {
+    swrMock = useSWR as jest.Mock
+  })
   afterEach(() => {
     jest.clearAllMocks()
   })

package/__tests__/pages/relatedArticles.test.tsx

@@ -5,7 +5,6 @@ import RelatedArticlesPage, {
   getServerSideProps,
 } from '../../pages/[section]/[articleId]/relatedArticles'
 import { renderWithTheme } from '../../helpers/test-utils'
-import { recomendationsMock } from '../../helpers/mocks/getRecommendationsMock'
 
 const props: RelatedArticles = {
   articleId: 'test-1',
@@ -19,7 +18,7 @@ const user = {
   subscriptions: [{ endDate: null }],
 }
 jest.mock('swr')
-const swrMock = useSWR as jest.Mock
+let swrMock
 
 jest.mock('newrelic', () => {
   return {
@@ -47,7 +46,6 @@ describe('Article', () => {
   describe('getServerSideProps', () => {
     beforeAll(() => {
       process.env = Object.assign(process.env, {
-        SITE_HOST: 'hostname',
         TWITTER_USERNAME: 'D_Trump',
         GSC_ID: '4320982',
       })
@@ -73,6 +71,9 @@ describe('Article', () => {
 })
 
 describe('Recommendation', () => {
+  beforeEach(() => {
+    swrMock = useSWR as jest.Mock
+  })
   afterEach(() => {
     jest.clearAllMocks()
   })
@@ -87,7 +88,18 @@ describe('Recommendation', () => {
   it('render related article page', async () => {
     let result
     await act(async () => {
-      swrMock.mockReturnValueOnce({ data: recomendationsMock })
+      swrMock.mockReturnValueOnce({
+        data: [
+          {
+            href:
+              'https://www.thesun.co.uk/wp-content/uploads/2022/03/image-656eaa885d.jpg?strip=all&w=600&h=338&crop=1',
+            tag: 'FOOT ON THE GAZ',
+            text:
+              'Bale considering short deal with new club before RETIRING after World Cup',
+            title: 'FOOT ON THE GAZ',
+          },
+        ],
+      })
       result = renderWithTheme(RelatedArticlesPage)
     })
     expect(result.findByTestId('articleRec-1')).toBeDefined()

package/components/article/__tests__/__snapshots__/index.test.tsx.snap

@@ -1060,7 +1060,7 @@ exports[`Article should render tile and sub title 1`] = `
                             >
                               <a
                                 class="nk-card-link css-1cq1vxv"
-                                href="https://newskit-render.ceng-dev.newsuk.tech"
+                                href="http://localhost"
                               >
                                 <section
                                   class="css-1mwgn7o"
@@ -1112,7 +1112,7 @@ exports[`Article should render tile and sub title 1`] = `
                             >
                               <a
                                 class="nk-card-link css-1cq1vxv"
-                                href="https://newskit-render.ceng-dev.newsuk.tech"
+                                href="http://localhost"
                               >
                                 <section
                                   class="css-1mwgn7o"
@@ -1312,7 +1312,7 @@ exports[`Article should render tile and sub title 1`] = `
                           >
                             <a
                               class="nk-card-link css-1cq1vxv"
-                              href="https://newskit-render.ceng-dev.newsuk.tech"
+                              href="http://localhost"
                             >
                               <section
                                 class="css-zs57uu"
@@ -1376,7 +1376,7 @@ exports[`Article should render tile and sub title 1`] = `
                           >
                             <a
                               class="nk-card-link css-1cq1vxv"
-                              href="https://newskit-render.ceng-dev.newsuk.tech"
+                              href="http://localhost"
                             >
                               <section
                                 class="css-zs57uu"

package/components/article/__tests__/index.test.tsx

@@ -74,13 +74,11 @@ const articleData: ArticleProps = {
   relatedArticles: [
     {
       title: 'Prince Harry',
-      tag: 'NEWS',
       text: 'news',
       href: 'https://plchldr.co/i/70x50',
     },
     {
       title: 'Meghan Markle',
-      tag: 'SPORT',
       text: 'news',
       href: 'https://plchldr.co/i/70x50',
     },
@@ -91,14 +89,6 @@ const articleData: ArticleProps = {
   gscId: '4320982',
 }
 
-// remove this variable once SITE_HOST is refactored
-jest.mock('../../../config', () => ({
-  siteHost: 'https://newskit-render.ceng-dev.newsuk.tech',
-}))
-
-jest.mock('@newskit-render/api', () => ({
-  acsSessionUrl: 'acsSessionUrl',
-}))
 jest.mock('@newskit-render/my-account', () => {
   return {
     PastDueBannerExternal: 'PastDueBannerExternal',

package/config/__tests__/index.test.ts

@@ -14,7 +14,6 @@ describe('getSanitizedConfig', () => {
   it('should return required config values', () => {
     process.env = {
       ...originalEnv,
-      SITE_HOST: 'host',
       NEWSKIT_API_ENV_URL: 'url',
       NEWSKIT_API_X_API_KEY: 'key',
       OKTA_CLIENT_ID: 'oktaId',
@@ -40,7 +39,6 @@ describe('getSanitizedConfig', () => {
   it('should throw error when NEWSKIT_API_ENV_URL is missing', () => {
     process.env = {
       ...originalEnv,
-      SITE_HOST: 'host',
       NEWSKIT_API_X_API_KEY: 'key',
       OKTA_CLIENT_ID: 'oktaId',
       OKTA_CLIENT_SECRET: 'oktasecret',

package/config/environment.ts

@@ -1,5 +1,4 @@
 const requiredConfigFields: string[] = [
-  'SITE_HOST',
   'NEWSKIT_API_ENV_URL',
   'NEWSKIT_API_X_API_KEY',
   'OKTA_CLIENT_ID',
@@ -25,7 +24,6 @@ export const getSanitizedConfig = () => {
     newskitApiEnvUrl: process.env.NEWSKIT_API_ENV_URL as string,
     newskitApiXApiKey: process.env.NEWSKIT_API_X_API_KEY as string,
     optimizelysdkKey: process.env.OPTIMIZELY_SDK_KEY as string,
-    siteHost: process.env.SITE_HOST as string,
     sitemapFirstPublicationDate: process.env
       .SITEMAP_FIRST_PUBLICATION_DATE as string,
     sitemapPublicationName: process.env.SITEMAP_PUBLICATION_NAME as string,
@@ -54,7 +52,6 @@ export const {
   newskitApiEnvUrl,
   newskitApiXApiKey,
   optimizelysdkKey,
-  siteHost,
   sitemapFirstPublicationDate,
   sitemapPublicationName,
   newRelicEnabled,

package/constants/index.ts

@@ -1,3 +1,2 @@
-import { siteHost } from '../config'
-
-export const ACCOUNT_QUERY_URL = `${siteHost}/api/account/query`
+export const getAccountQueryUrl = (siteHost: string): string =>
+  `${siteHost}/api/account/query`

package/helpers/setupTests.ts

@@ -3,7 +3,3 @@
 // expect(element).toHaveTextContent(/react/i)
 // learn more: https://github.com/testing-library/jest-dom
 import '@testing-library/jest-dom/extend-expect'
-
-
-// remove this variable once SITE_HOST is refactored
-process.env.SITE_HOST = 'https://newskit-render.ceng-dev.newsuk.tech'

package/infrastructure/helm/values-dev.yaml

@@ -8,7 +8,6 @@ revisionHistoryLimit: 3
 
 envs:
   NEWSKIT_API_ENV_URL: 'https://newskit.dev.newsapis.co.uk/graphql'
-  SITE_HOST: ''
   PUBLISHER: ''
   TITLE: ''
   SITEMAP_PUBLICATION_NAME: ''

package/infrastructure/helm/values-pr.yaml

@@ -8,7 +8,6 @@ revisionHistoryLimit: 3
 
 envs:
   NEWSKIT_API_ENV_URL: 'https://newskit.dev.newsapis.co.uk/graphql'
-  SITE_HOST: ''
   PUBLISHER: ''
   TITLE: ''
   SITEMAP_PUBLICATION_NAME: ''

package/infrastructure/helm/values-prod.yaml

@@ -8,7 +8,6 @@ revisionHistoryLimit: 5
 
 envs:
   NEWSKIT_API_ENV_URL: 'https://newskit.newsapis.co.uk/graphql'
-  SITE_HOST: ''
   PUBLISHER: ''
   TITLE: ''
   SITEMAP_PUBLICATION_NAME: ''

package/infrastructure/helm/values-staging.yaml

@@ -8,7 +8,6 @@ revisionHistoryLimit: 5
 
 envs:
   NEWSKIT_API_ENV_URL: 'https://newskit.staging.newsapis.co.uk/graphql'
-  SITE_HOST: ''
   PUBLISHER: ''
   TITLE: ''
   SITEMAP_PUBLICATION_NAME: ''

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "1.79.1",
+  "version": "1.79.2-alpha.0",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -33,14 +33,14 @@
   },
   "dependencies": {
     "@apollo/client": "3.4.16",
-    "@newskit-render/api": "^0.36.0",
+    "@newskit-render/api": "^0.36.1-alpha.0",
     "@newskit-render/auth": "^0.44.0",
-    "@newskit-render/checkout": "^0.51.5",
+    "@newskit-render/checkout": "^0.51.6-alpha.0",
     "@newskit-render/feature-flags": "^0.24.0",
     "@newskit-render/feed": "^0.24.0",
     "@newskit-render/my-account": "^0.184.0",
-    "@newskit-render/shared-components": "^0.68.0",
-    "@newskit-render/standalone-components": "^0.33.0",
+    "@newskit-render/shared-components": "^0.68.1-alpha.0",
+    "@newskit-render/standalone-components": "^0.33.1-alpha.0",
     "@newskit-render/validation": "^0.50.0",
     "cross-fetch": "3.1.5",
     "graphql": "15.6.0",

package/pages/[section]/[articleId]/[articleSlug].tsx

@@ -8,13 +8,13 @@ import {
 } from '@newskit-render/api'
 import { UserData } from '@newskit-render/my-account'
 import { Article } from '@newskit-render/standalone-components'
+import { getHost } from '@newskit-render/shared-components'
 import { GET_UNIVERSAL_ARTICLE } from '../../../queries'
 import ArticlePage, { UniversalArticle } from '../../../components/article'
 import { fetchUser } from '../../../helpers/getUser'
-import { ACCOUNT_QUERY_URL } from '../../../constants'
+import { getAccountQueryUrl } from '../../../constants'
 import { addCacheHeaders } from '../../../helpers/addCacheHeaders'
 import {
-  siteHost as configSiteHost,
   twitterUsername as configTwitterUsername,
   gscId as configGscId,
 } from '../../../config'
@@ -43,16 +43,16 @@ const Article: React.FC<ArticleSlug> = ({
   if (typeof window !== 'undefined') {
     userId = window?.utag?.data['cp.utag_main_v_id']
   }
-  const highlitedArticles = []
-  const relatedArticles = []
+  let highlitedArticles = []
+  let relatedArticles = []
   const { data: recommendations } = useSWR<Article[]>(
     `/api/recommendations/${articleId}/${userId}`,
     fetcher
   )
 
   if (Array.isArray(recommendations)) {
-    highlitedArticles.push(recommendations.slice(0, 4))
-    relatedArticles.push(recommendations.slice(4, 12))
+    highlitedArticles = recommendations.slice(0, 4)
+    relatedArticles = recommendations.slice(4, 12)
   }
   return (
     <ArticlePage
@@ -73,7 +73,7 @@ export async function getServerSideProps(context) {
   const acsCookie = context.req.headers.cookie
     ? getAcsCookie(ClientTypes.main, context.req.headers.cookie)
     : ''
-
+  const siteHost = getHost(context.req)
   const {
     params: { articleId, section, articleSlug },
   } = context
@@ -87,16 +87,16 @@ export async function getServerSideProps(context) {
       query: GET_UNIVERSAL_ARTICLE,
       variables: { publisher: 'DEMO', id: articleId },
     }),
-    await fetchUser(acsCookie, ACCOUNT_QUERY_URL),
+    await fetchUser(acsCookie, getAccountQueryUrl(siteHost)),
   ])
 
   addCacheHeaders(context.res)
   return {
     props: {
       universalArticle: data.universalArticle,
-      articleURL: `${configSiteHost}/${section}/${articleId}/${articleSlug}`,
+      articleURL: `${siteHost}/${section}/${articleId}/${articleSlug}`,
       twitterUsername: configTwitterUsername || '',
-      siteHost: configSiteHost || '',
+      siteHost,
       gscId: configGscId || '',
       showAds: true,
       user,

package/pages/[section]/[articleId]/relatedArticles.tsx

@@ -3,10 +3,11 @@ import newrelic from 'newrelic'
 import useSWR from 'swr'
 import { getAcsCookie, ClientTypes } from '@newskit-render/api'
 import { Article } from '@newskit-render/standalone-components'
+import { getHost } from '@newskit-render/shared-components'
 import { Block, Cell, TitleBar } from 'newskit'
 import { UserData } from '@newskit-render/my-account'
 import { fetchUser } from '../../../helpers/getUser'
-import { ACCOUNT_QUERY_URL } from '../../../constants'
+import { getAccountQueryUrl } from '../../../constants'
 import { addCacheHeaders } from '../../../helpers/addCacheHeaders'
 import Layout from '../../../components/layout'
 import { BasicRow } from '../../../components/section/layouts'
@@ -26,14 +27,14 @@ const RelatedArticlesPage: React.FC<RelatedArticles> = ({
     userId = window?.utag?.data['cp.utag_main_v_id']
   }
 
-  const recommendations = []
+  let recommendations = []
   const { data: recommendationData } = useSWR<Article[]>(
     `/api/recommendations/${articleId}/${userId}`,
     fetcher
   )
 
   if (Array.isArray(recommendationData)) {
-    recommendations.push(recommendationData.slice(0, 4))
+    recommendations = recommendationData.slice(0, 4)
   }
   return (
     <Layout dataTestId="SectionGrid" user={user}>
@@ -71,17 +72,16 @@ export async function getServerSideProps(context) {
   newrelic.setTransactionName('RelatedArticlesPage')
   console.warn('context:')
   console.warn(context.req && context.req.headers)
-
   const {
     params: { articleId },
   } = context
-
+  const siteHost = getHost(context.req)
   const acsCookie = context.req.headers.cookie
     ? getAcsCookie(ClientTypes.main, context.req.headers.cookie)
     : ''
 
   const [user] = await Promise.all([
-    await fetchUser(acsCookie, ACCOUNT_QUERY_URL),
+    await fetchUser(acsCookie, getAccountQueryUrl(siteHost)),
   ])
 
   addCacheHeaders(context.res)

package/pages/[section]/index.tsx

@@ -4,10 +4,11 @@ import {
   getAcsCookie,
   ClientTypes,
 } from '@newskit-render/api'
+import { getHost } from '@newskit-render/shared-components'
 import { GET_PAGE } from '../../queries'
 import SectionPage from '../../components/section'
 import { fetchUser } from '../../helpers/getUser'
-import { ACCOUNT_QUERY_URL } from '../../constants'
+import { getAccountQueryUrl } from '../../constants'
 import { addCacheHeaders } from '../../helpers/addCacheHeaders'
 
 export async function getServerSideProps(context) {
@@ -20,7 +21,7 @@ export async function getServerSideProps(context) {
   const acsCookie = context.req.headers.cookie
     ? getAcsCookie(ClientTypes.main, context.req.headers.cookie)
     : ''
-
+  const siteHost = getHost(context.req)
   newrelic.setTransactionName(`Section: ${section}`)
 
   let data
@@ -31,7 +32,7 @@ export async function getServerSideProps(context) {
         query: GET_PAGE,
         variables: { channel: section, publisher: 'DEMO' },
       }),
-      await fetchUser(acsCookie, ACCOUNT_QUERY_URL),
+      await fetchUser(acsCookie, getAccountQueryUrl(siteHost)),
     ])
     data = pageData
     user = pageUser

package/pages/api/feed.ts

@@ -1,14 +1,15 @@
 import { NextApiRequest, NextApiResponse } from 'next'
 import { rssFeed, UpdatePeriod } from '@newskit-render/feed'
 import { Publisher } from '@newskit-render/api'
-import { publisher, siteHost } from '../../config'
+import { getHost } from '@newskit-render/shared-components'
+import { publisher } from '../../config'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) =>
   rssFeed({
     res,
     publisher:
       publisher === 'DEMO' ? Publisher.VIRGIN : (publisher as Publisher),
-    domain: siteHost,
+    domain: getHost(req) as string,
     titeAttributes: {
       title: 'Demo Site',
       link: '/feed',

package/pages/api/news-sitemap.ts

@@ -1,7 +1,8 @@
 import { NextApiRequest, NextApiResponse } from 'next'
 import { newsSitemap } from '@newskit-render/feed'
 import { Publisher } from '@newskit-render/api'
-import { publisher, siteHost, sitemapPublicationName } from '../../config'
+import { getHost } from '@newskit-render/shared-components'
+import { publisher, sitemapPublicationName } from '../../config'
 /* We do not have sitemap date for Demo so using Virgin,
  * This can be removed and replace with just - publisher: process.env.PUBLISHER as PublisherGroup, in created projects
  */
@@ -11,7 +12,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) =>
     res,
     publisher:
       publisher === 'DEMO' ? Publisher.VIRGIN : (publisher as Publisher),
-    domain: new URL(siteHost as string).host,
+    domain: new URL(getHost(req) as string).host,
     publicationName: sitemapPublicationName as string,
   })
 

package/pages/api/sitemap.ts

@@ -1,9 +1,9 @@
 import { NextApiRequest, NextApiResponse } from 'next'
 import { genericSitemap, CustomStaticPage } from '@newskit-render/feed'
 import { Publisher } from '@newskit-render/api'
+import { getHost } from '@newskit-render/shared-components'
 import {
   publisher,
-  siteHost,
   sitemapFirstPublicationDate,
   sitemapPublicationName,
 } from '../../config'
@@ -22,7 +22,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) =>
     query: req.query,
     publisher:
       publisher === 'DEMO' ? Publisher.VIRGIN : (publisher as Publisher),
-    domain: new URL(siteHost as string).host,
+    domain: new URL(getHost(req) as string).host,
     firstArticleDate: sitemapFirstPublicationDate as string,
     publicationName: sitemapPublicationName as string,
     customStaticPageCollection: defaultCustomStaticPagesCollection,

package/pages/index.tsx

@@ -4,10 +4,11 @@ import {
   getAcsCookie,
   ClientTypes,
 } from '@newskit-render/api'
+import { getHost } from '@newskit-render/shared-components'
 import { GET_PAGE } from '../queries'
 import SectionPage from '../components/section'
 import { fetchUser } from '../helpers/getUser'
-import { ACCOUNT_QUERY_URL } from '../constants'
+import { getAccountQueryUrl } from '../constants'
 import { addCacheHeaders } from '../helpers/addCacheHeaders'
 
 export async function getServerSideProps(context) {
@@ -20,13 +21,13 @@ export async function getServerSideProps(context) {
   const acsCookie = context.req.headers.cookie
     ? getAcsCookie(ClientTypes.main, context.req.headers.cookie)
     : ''
-
+  const siteHost = getHost(context.req)
   const [{ data }, user] = await Promise.all([
     apolloClient.query({
       query: GET_PAGE,
       variables: { channel: 'homepage', publisher: 'DEMO' },
     }),
-    await fetchUser(acsCookie, ACCOUNT_QUERY_URL),
+    await fetchUser(acsCookie, getAccountQueryUrl(siteHost)),
   ])
 
   addCacheHeaders(context.res)

package/pages/preview/[articleId]/version/[versionId]/index.tsx

@@ -15,6 +15,7 @@ import {
   CookieView,
 } from '@newskit-render/auth'
 import { createApolloClient, ClientTypes } from '@newskit-render/api'
+import { getHost } from '@newskit-render/shared-components'
 import { GET_UNIVERSAL_ARTICLE } from '../../../../../queries'
 import ArticlePage from '../../../../../components/article'
 import {
@@ -23,7 +24,6 @@ import {
 } from '../../../../../helpers/mocks/articleMock'
 import { addCacheHeaders } from '../../../../../helpers/addCacheHeaders'
 import {
-  siteHost as configSiteHost,
   twitterUsername as configTwitterUsername,
   gscId as configGscId,
 } from '../../../../../config'
@@ -90,6 +90,7 @@ const PreviewArticle = ({
 export async function getServerSideProps(context) {
   const apolloClient = await createApolloClient(ClientTypes.nkapi)
   const session = await getSession(context)
+  const siteHost = getHost(context.req)
   if (!session) {
     return {
       props: {},
@@ -109,9 +110,9 @@ export async function getServerSideProps(context) {
     props: {
       universalArticle: data.universalArticle,
       session,
-      articleURL: `${configSiteHost}/preview/${articleId}/version/${versionId}`,
+      articleURL: `${siteHost}/preview/${articleId}/version/${versionId}`,
       twitterUsername: configTwitterUsername || '',
-      siteHost: configSiteHost || '',
+      siteHost,
       gscId: configGscId || '',
     },
   }