@newskit-render/core 1.75.2-alpha.0 → 1.76.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.75.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.75.2-alpha.0...@newskit-render/core@1.75.2) (2022-07-15)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
 ## [1.75.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.75.1-alpha.0...@newskit-render/core@1.75.1) (2022-07-14)
 
 **Note:** Version bump only for package @newskit-render/core

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "1.75.2-alpha.0",
+  "version": "1.76.0",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -35,12 +35,12 @@
     "@apollo/client": "3.4.16",
     "@newskit-render/api": "^0.36.0",
     "@newskit-render/auth": "^0.44.0",
-    "@newskit-render/checkout": "^0.50.2-alpha.0",
+    "@newskit-render/checkout": "^0.51.0",
     "@newskit-render/feature-flags": "^0.24.0",
     "@newskit-render/feed": "^0.24.0",
-    "@newskit-render/my-account": "^0.181.2-alpha.0",
-    "@newskit-render/shared-components": "^0.66.2-alpha.0",
-    "@newskit-render/standalone-components": "^0.28.3-alpha.0",
+    "@newskit-render/my-account": "^0.182.0",
+    "@newskit-render/shared-components": "^0.67.0",
+    "@newskit-render/standalone-components": "^0.29.0",
     "@newskit-render/validation": "^0.50.0",
     "cross-fetch": "3.1.5",
     "graphql": "15.6.0",

package/pages/help-hub/article/[title]/index.tsx

@@ -1,21 +1,20 @@
 import React, { useContext } from 'react'
 import newrelic from 'newrelic'
 import {
-  ArticlePage,
-  articleProvider,
-  ProviderPropsMapper,
+  HelpHubArticlePage,
+  helpHubArticleProvider,
 } from '@newskit-render/standalone-components'
 import { createThemeDropdownObject } from '../../../../helpers/createThemeDropdownObject'
 import { AppContext } from '../../../../context'
+import { addCacheHeaders } from '../../../../helpers/addCacheHeaders'
 
-const HelpHubArticlePage = (props) => {
+const ArticlePage = (props) => {
   const { theme, setTheme } = useContext(AppContext)
   const themeDropdownObject = createThemeDropdownObject(setTheme)
 
   return (
-    <ArticlePage
+    <HelpHubArticlePage
       {...props}
-      contextName="articlePage"
       customTheme={theme}
       themeDropdownObject={themeDropdownObject}
     />
@@ -26,6 +25,8 @@ export const getServerSideProps = async (context) => {
   newrelic.setTransactionName('HelpHubArticlePage')
   console.warn('context:')
   console.warn(context.req && context.req.headers)
-  return articleProvider({ ...context })
+
+  addCacheHeaders(context.res)
+  return helpHubArticleProvider({ ...context })
 }
-export default HelpHubArticlePage
+export default ArticlePage

package/pages/help-hub/index.tsx

@@ -1,39 +1,63 @@
 import React, { useContext } from 'react'
+import newrelic from 'newrelic'
 import {
-  LandingPage,
-  AlgoliaCredentials,
-  ContextName,
+  HelpHubLandingPage,
+  helpHubLandingPageProvider,
 } from '@newskit-render/standalone-components'
 import { createThemeDropdownObject } from '../../helpers/createThemeDropdownObject'
 import { AppContext } from '../../context'
-import { algoliaApiKey, algoliaAppId, algoliaIndex } from '../../config'
+import { addCacheHeaders } from '../../helpers/addCacheHeaders'
 
-const HelpHubLandingPage: React.FC<{ credentials: AlgoliaCredentials }> = (
-  props
-) => {
+const mostReadArticles = [
+  {
+    title: 'Sign-in with Google',
+    objectID: 'sign-with-google',
+  },
+  {
+    title:
+      'I am trying to share an article via Google+ but an error message keeps appearing',
+    objectID:
+      'i-am-trying-to-share-an-article-via-google-but-an-error-message-keeps-appearing',
+  },
+  {
+    title: 'How will I find out if I have won a competition?',
+    objectID: 'how-will-i-find-out-if-i-have-won-a-competition',
+  },
+  {
+    title: 'How do I login/reset my password?',
+    objectID: 'how-do-i-login-reset-my-password',
+  },
+  {
+    title: 'How do I cancel or change my pack?',
+    objectID: 'how-do-i-cancel-or-change-my-pack',
+  },
+  {
+    title: 'Can I share my Times & Sunday Times iPad subscription access?',
+    objectID: 'can-i-share-my-times-sunday-times-ipad-subscription-access',
+  },
+]
+
+const LandingPage = ({ credentials }) => {
   const { theme, setTheme } = useContext(AppContext)
   const themeDropdownObject = createThemeDropdownObject(setTheme)
 
   return (
-    <LandingPage
-      {...props}
-      contextName={ContextName.landingPage}
+    <HelpHubLandingPage
+      credentials={credentials}
+      context={{ mostReadArticles }}
       customTheme={theme}
       themeDropdownObject={themeDropdownObject}
     />
   )
 }
 
-export async function getServerSideProps() {
-  return {
-    props: {
-      credentials: {
-        appId: algoliaAppId,
-        apiKey: algoliaApiKey,
-        indexName: algoliaIndex,
-      },
-    },
-  }
-}
+export default LandingPage
 
-export default HelpHubLandingPage
+export const getServerSideProps = async (context) => {
+  newrelic.setTransactionName('HelpHubLandingPage')
+  console.warn('context:')
+  console.warn(context.req && context.req.headers)
+  addCacheHeaders(context.res)
+
+  return helpHubLandingPageProvider()
+}

package/pages/help-hub/results.tsx

@@ -1,15 +1,16 @@
 import React, { useContext } from 'react'
+import newrelic from 'newrelic'
 import {
-  ResultsPage,
+  HelpHubResultsPage,
   AlgoliaCredentials,
   Hit,
-  resultsProvider,
-  ContextName,
+  helpHubResultsProvider,
 } from '@newskit-render/standalone-components'
 import { createThemeDropdownObject } from '../../helpers/createThemeDropdownObject'
 import { AppContext } from '../../context'
+import { addCacheHeaders } from '../../helpers/addCacheHeaders'
 
-const HelpHubResultsPage: React.FC<{
+const ResultsPage: React.FC<{
   credentilas: AlgoliaCredentials
   hits: Hit[]
 }> = (props) => {
@@ -17,9 +18,8 @@ const HelpHubResultsPage: React.FC<{
   const themeDropdownObject = createThemeDropdownObject(setTheme)
   const credentials = { props }
   return (
-    <ResultsPage
+    <HelpHubResultsPage
       {...props}
-      contextName={ContextName.resultsPage}
       customTheme={theme}
       themeDropdownObject={themeDropdownObject}
       credentials={credentials}
@@ -27,8 +27,15 @@ const HelpHubResultsPage: React.FC<{
   )
 }
 
-export default HelpHubResultsPage
+export default ResultsPage
 
 export const getServerSideProps = async (context) => {
-  return resultsProvider({ ...context })
+  newrelic.setTransactionName('HelpHubResultsPage')
+  console.warn('context:')
+  console.warn(context.req && context.req.headers)
+
+  addCacheHeaders(context.res)
+
+  const results = await helpHubResultsProvider({ ...context })
+  return results
 }