@newskit-render/core 2.10.3 → 2.12.0

package/CHANGELOG.md

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

package/cypress/e2e/account/holiday-stop.spec.js

@@ -1,12 +1,38 @@
-// describe('Book a holiday stop', () => {
-//   beforeEach(() => {
-//     cy.GetAcsSession()
-//     cy.mockConsentAndVisit('/account/holiday-stop/book')
-//   })
+describe('Book a holiday stop', () => {
+  beforeEach(() => {
+    cy.GetAcsSession()
+    cy.mockConsentAndVisit('/account/holiday-stop/book')
+  })
 
-//   it('should display book a holiday stop page', () => {
-//     cy.get('a[href="/account/subscription-and-billing"]').should('be.visible')
-//     cy.contains('[data-testid="introduction-title"]', 'Book a holiday stop')
-//     cy.contains('Add a Holiday Stop')
-//   })
-// })
+  it('should display book a holiday stop page', () => {
+    cy.get('a[href="/account/subscription-and-billing"]').should('be.visible')
+    cy.contains('[data-testid="introduction-title"]', 'Book a holiday stop')
+    cy.contains('Add a Holiday Stop')
+    cy.get('a[href="/account/holiday-stop/upcoming-holiday-stops"]').should(
+      'not.exist'
+    )
+    cy.get('a[href="/account/holiday-stop/previous-holiday-stops"]').should(
+      'not.exist'
+    )
+  })
+})
+
+describe.skip(
+  'Upcoming holiday stops',
+  {
+    env: {
+      MAIN_COOKIE_NAME: 'acs_tnl',
+    },
+  },
+  () => {
+    beforeEach(() => {
+      cy.GetTnlAcsSession()
+      cy.mockConsentAndVisit('/account/holiday-stop/book')
+    })
+
+    it('should navigate to the Upcoming holiday stops and display the list of upcoming holiday stops', () => {
+      cy.get('a[href="/account/holiday-stop/upcoming-holiday-stops"]').click()
+      cy.get('[data-testid="content-list"] > ul > li').should('have.length', 6)
+    })
+  }
+)

package/cypress/support/commands.js

@@ -48,6 +48,10 @@ const userMap = {
     username: 'render-paypal-payment@yopmail.com',
     password: 'testing123',
   },
+  tnl: {
+    username: 'cmp1aug2022printstag@yopmail.com',
+    password: 'Password123',
+  },
 }
 
 Cypress.Commands.add('GetAcsSession', (user = 'default') => {
@@ -73,6 +77,29 @@ Cypress.Commands.add('GetAcsSession', (user = 'default') => {
   })
 })
 
+Cypress.Commands.add('GetTnlAcsSession', (user = 'tnl') => {
+  const { username, password } = userMap[user]
+  cy.request({
+    method: 'POST',
+    url: 'https://login.staging-thetimes.co.uk/services/session',
+    headers: {
+      'Content-Type': 'application/vnd.newsuk.acs.createsession-v1+json',
+    },
+    body: {
+      rememberMe: false,
+      gotoUrl: 'https://login.staging-thesun.co.uk/',
+      sso: false,
+      authCredentials: {
+        username,
+        password,
+      },
+    },
+  }).then((response) => {
+    const acs_tnl = response.body.acsCookies.cookies[0].value
+    cy.setCookie('acs_tnl', acs_tnl)
+  })
+})
+
 Cypress.Commands.add('createNewEmail', () => {
   const newEmail =
     Cypress.env('MAIN_USER_EMAIL').split('@')[0].split('').reverse().join('') +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "2.10.3",
+  "version": "2.12.0",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -40,12 +40,12 @@
     "@emotion/styled": "11.10.4",
     "@newskit-render/api": "^1.2.1",
     "@newskit-render/auth": "^1.1.1",
-    "@newskit-render/checkout": "^1.3.5",
+    "@newskit-render/checkout": "^1.3.7",
     "@newskit-render/feature-flags": "^1.2.0",
     "@newskit-render/feed": "^1.1.1",
-    "@newskit-render/my-account": "^3.8.1",
-    "@newskit-render/shared-components": "^1.8.0",
-    "@newskit-render/standalone-components": "^1.6.0",
+    "@newskit-render/my-account": "^3.9.0",
+    "@newskit-render/shared-components": "^1.9.0",
+    "@newskit-render/standalone-components": "^1.7.1",
     "@newskit-render/validation": "^1.2.1",
     "cross-fetch": "3.1.5",
     "graphql": "15.6.0",

package/pages/account/holiday-stop/previous-holiday-stops.tsx

@@ -0,0 +1,25 @@
+import { getProviderProps, HolidayStopList } from '@newskit-render/my-account'
+import newrelic from 'newrelic'
+import React, { useContext } from 'react'
+import { AppContext } from '../../../context/app-context'
+import { createThemeDropdownObject } from '../../../helpers/createThemeDropdownObject'
+
+const AccountPreviousHolidayStops = (props) => {
+  const { theme, setTheme } = useContext(AppContext)
+  const themeDropdownObject = createThemeDropdownObject(setTheme)
+  return (
+    <HolidayStopList
+      {...props}
+      customTheme={theme}
+      themeDropdownObject={themeDropdownObject}
+      holidayStopType="previous"
+    />
+  )
+}
+
+export default AccountPreviousHolidayStops
+
+export const getServerSideProps = async (context) => {
+  newrelic.setTransactionName('Account: Previous Holiday Stops')
+  return getProviderProps({ ...context, provider: 'HolidayStop' })
+}

package/pages/account/holiday-stop/upcoming-holiday-stops.tsx

@@ -0,0 +1,25 @@
+import { getProviderProps, HolidayStopList } from '@newskit-render/my-account'
+import newrelic from 'newrelic'
+import React, { useContext } from 'react'
+import { AppContext } from '../../../context/app-context'
+import { createThemeDropdownObject } from '../../../helpers/createThemeDropdownObject'
+
+const AccountUpcomingHolidayStops = (props) => {
+  const { theme, setTheme } = useContext(AppContext)
+  const themeDropdownObject = createThemeDropdownObject(setTheme)
+  return (
+    <HolidayStopList
+      {...props}
+      customTheme={theme}
+      themeDropdownObject={themeDropdownObject}
+      holidayStopType="upcoming"
+    />
+  )
+}
+
+export default AccountUpcomingHolidayStops
+
+export const getServerSideProps = async (context) => {
+  newrelic.setTransactionName('Account: Upcoming Holiday Stops')
+  return getProviderProps({ ...context, provider: 'HolidayStop' })
+}

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

@@ -1,6 +1,7 @@
 import React, { useContext } from 'react'
 import newrelic from 'newrelic'
 import {
+  AlgoliaCredentials,
   HelpHubArticlePage,
   helpHubArticleProvider,
 } from '@newskit-render/standalone-components'
@@ -8,7 +9,11 @@ import { createThemeDropdownObject } from '../../../../helpers/createThemeDropdo
 import { AppContext } from '../../../../context'
 import { addCacheHeaders } from '../../../../helpers/addCacheHeaders'
 
-const ArticlePage = (props) => {
+const ArticlePage: React.FC<{
+  credentials: AlgoliaCredentials
+  title: string
+  content: string
+}> = (props) => {
   const { theme, setTheme } = useContext(AppContext)
   const themeDropdownObject = createThemeDropdownObject(setTheme)
 
@@ -21,12 +26,13 @@ const ArticlePage = (props) => {
   )
 }
 
+export default ArticlePage
+
 export const getServerSideProps = async (context) => {
   newrelic.setTransactionName('HelpHubArticlePage')
   console.warn('context:')
   console.warn(context.req && context.req.headers)
-
   addCacheHeaders(context.res)
-  return helpHubArticleProvider({ ...context })
+
+  return helpHubArticleProvider(context)
 }
-export default ArticlePage

package/pages/help-hub/index.tsx

@@ -1,6 +1,7 @@
 import React, { useContext } from 'react'
 import newrelic from 'newrelic'
 import {
+  AlgoliaCredentials,
   HelpHubLandingPage,
   helpHubLandingPageProvider,
 } from '@newskit-render/standalone-components'
@@ -37,13 +38,15 @@ const mostReadArticles = [
   },
 ]
 
-const LandingPage = ({ credentials }) => {
+const LandingPage: React.FC<{
+  credentials: AlgoliaCredentials
+}> = (props) => {
   const { theme, setTheme } = useContext(AppContext)
   const themeDropdownObject = createThemeDropdownObject(setTheme)
 
   return (
     <HelpHubLandingPage
-      credentials={credentials}
+      {...props}
       context={{ mostReadArticles }}
       customTheme={theme}
       themeDropdownObject={themeDropdownObject}

package/pages/help-hub/results.tsx

@@ -16,13 +16,12 @@ const ResultsPage: React.FC<{
 }> = (props) => {
   const { theme, setTheme } = useContext(AppContext)
   const themeDropdownObject = createThemeDropdownObject(setTheme)
-  const { credentials } = props
+
   return (
     <HelpHubResultsPage
       {...props}
       customTheme={theme}
       themeDropdownObject={themeDropdownObject}
-      credentials={credentials}
     />
   )
 }
@@ -33,9 +32,7 @@ export const getServerSideProps = async (context) => {
   newrelic.setTransactionName('HelpHubResultsPage')
   console.warn('context:')
   console.warn(context.req && context.req.headers)
-
   addCacheHeaders(context.res)
 
-  const results = await helpHubResultsProvider({ ...context })
-  return results
+  return helpHubResultsProvider(context)
 }