@newskit-render/core 0.0.0-caeaa514b → 0.0.0-cc45b00ad

package/Dockerfile.withNewRelic

@@ -4,7 +4,6 @@ WORKDIR /app
 
 ENV NEXT_TELEMETRY_DISABLED 1
 
-RUN npm install @newrelic/next
 COPY .next/standalone ./standalone
 COPY public ./standalone/public
 COPY .next/static ./standalone/.next/static
@@ -12,4 +11,4 @@ COPY .next/static ./standalone/.next/static
 EXPOSE 3000
 ENV PORT 3000
 
-CMD ["node", "-r", "@newrelic/next", "./standalone/server.js"]
+CMD ["node", "./standalone/server.js"]

package/__tests__/pages/__snapshots__/home.test.tsx.snap

@@ -102,7 +102,6 @@ exports[`getServerSideProps Homepage 1`] = `
                 aria-label="Section One Link"
                 class="css-1ulbpfm"
                 href="/section-one"
-                type="standalone"
               >
                 <span
                   class="css-1xnclyu"
@@ -126,7 +125,6 @@ exports[`getServerSideProps Homepage 1`] = `
                 aria-label="Section Two Link"
                 class="css-1ulbpfm"
                 href="/section-two"
-                type="standalone"
               >
                 <span
                   class="css-1xnclyu"
@@ -150,7 +148,6 @@ exports[`getServerSideProps Homepage 1`] = `
                 aria-label="Section Three Link"
                 class="css-1ulbpfm"
                 href="/section-three"
-                type="standalone"
               >
                 <span
                   class="css-1xnclyu"

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

@@ -102,7 +102,6 @@ exports[`Article should render tile and sub title 1`] = `
                 aria-label="Section One Link"
                 class="css-1ulbpfm"
                 href="/section-one"
-                type="standalone"
               >
                 <span
                   class="css-1xnclyu"
@@ -126,7 +125,6 @@ exports[`Article should render tile and sub title 1`] = `
                 aria-label="Section Two Link"
                 class="css-1ulbpfm"
                 href="/section-two"
-                type="standalone"
               >
                 <span
                   class="css-1xnclyu"
@@ -150,7 +148,6 @@ exports[`Article should render tile and sub title 1`] = `
                 aria-label="Section Three Link"
                 class="css-1ulbpfm"
                 href="/section-three"
-                type="standalone"
               >
                 <span
                   class="css-1xnclyu"

package/components/header/banner-messages.ts

@@ -32,6 +32,10 @@ export const pastDueBanner = {
     text: 'We have successfully cancelled your subscription and will be processing your refund shortly. If you have any question please call ##PHONE_NUMBER##.',
     dismissDays: 7,
   },
+  paymentFailure: {
+    title: 'We haven’t been able to take payment',
+    text: 'Your latest payment has failed. Please update your payment details as soon as possible to keep your membership.',
+  },
   treshold: {
     firstNotice: 26,
     secondNotice: 30,

package/cypress/e2e/account/holiday-stops.cy.js

@@ -1,6 +1,6 @@
 import { getTestDates } from '../../fixtures/testDates'
 
-describe('Book a Holiday Stop', () => {
+describe.skip('Book a Holiday Stop', () => {
   beforeEach(() => {
     cy.GetTnlAcsSession('tnl')
     cy.mockConsentAndVisit('/account/holiday-stop')
@@ -13,7 +13,7 @@ describe('Book a Holiday Stop', () => {
   })
 })
 
-describe('Add a Holiday Stop', () => {
+describe.skip('Add a Holiday Stop', () => {
   beforeEach(() => {
     cy.GetTnlAcsSession('tnl')
     cy.mockConsentAndVisit('/account/add/holiday-stop')
@@ -52,7 +52,7 @@ describe('Add a Holiday Stop', () => {
   })
 })
 
-describe('Upcoming Holiday Stops - edit button', () => {
+describe.skip('Upcoming Holiday Stops - edit button', () => {
   beforeEach(() => {
     cy.GetTnlAcsSession('tnl')
     cy.mockConsentAndVisit('/account/holiday-stop')
@@ -86,7 +86,7 @@ describe('Upcoming Holiday Stops - edit button', () => {
   })
 })
 
-describe('Cancel Holiday Stop', () => {
+describe.skip('Cancel Holiday Stop', () => {
   beforeEach(() => {
     cy.GetTnlAcsSession('tnl')
     cy.mockConsentAndVisit('/account/holiday-stop')

package/cypress/e2e/account/newsletters-page.cy.js

@@ -1,33 +1,53 @@
 describe('Newsletters page', () => {
   beforeEach(() => {
     cy.GetTnlAcsSession()
+    cy.mockConsent()
+  })
+
+  // will be fixed in TMR-2284
+  it.skip('Should display all the newsletters on the newsletters page when user has a subscription', () => {
     cy.mockConsentAndVisit('/account/newsletters')
+    cy.contains('Newsletters')
+    cy.contains(
+      'Exclusive content and a curated selection of our top stories straight to your inbox.'
+    )
+    cy.get('[data-testid="newsletters-grid"] > div > div').should(
+      'have.length',
+      23
+    )
   })
 
-  it('Should display the newsletters page', () => {
+  it('Should only display selected newsletters on the newsletters page when user is registered', () => {
+    cy.GetTnlAcsSession('tnlNoSubscription')
+    cy.mockConsentAndVisit('/account/newsletters')
     cy.contains('Newsletters')
     cy.contains(
       'Exclusive content and a curated selection of our top stories straight to your inbox.'
     )
-    cy.get('[data-testid="newsletters-grid"] > div').should('have.length', 20)
+    cy.get('[data-testid="newsletters-grid"] > div > div').should(
+      'have.length',
+      6
+    )
   })
 
   it('Should display all required newsletter text in the first grid card', () => {
-    cy.get('[data-testid="newsletters-grid"]').then(($parentDiv) => {
+    cy.mockConsentAndVisit('/account/newsletters')
+    cy.get('[data-testid="newsletters-grid-featured"]').then(($parentDiv) => {
       const firstNewsletter = $parentDiv.find('div:first-child')
 
-      cy.wrap(firstNewsletter).contains('Business').should('be.visible')
+      cy.wrap(firstNewsletter).contains('Daily Briefing').should('be.visible')
       cy.wrap(firstNewsletter).contains('Daily').should('be.visible')
       cy.wrap(firstNewsletter)
         .contains(
-          "The business editor's exclusive analysis of all the latest financial and economic news."
+          'Our flagship newsletter with our top stories and exclusive analysis every morning.'
         )
         .should('be.visible')
     })
   })
 
   it('Should successfully subscribe to a newsletter', () => {
-    cy.get('[data-testid="newsletters-grid"]').then(($parentDiv) => {
+    cy.mockConsentAndVisit('/account/newsletters')
+    cy.get('[data-testid="newsletters-grid-featured"]').then(($parentDiv) => {
       cy.intercept('POST', '/api/account/mutate', { statusCode: 200, ok: true })
 
       const firstNewsletter = $parentDiv.find('div:first-child')
@@ -40,13 +60,14 @@ describe('Newsletters page', () => {
 
       cy.contains(
         '[data-testid="toast-container"]',
-        'Thank you, you are now signed up to the Business newsletter'
+        'Thank you, you are now signed up to the Daily Briefing newsletter'
       )
     })
   })
 
   it('Should show the error toast on server error', () => {
-    cy.get('[data-testid="newsletters-grid"]').then(($parentDiv) => {
+    cy.mockConsentAndVisit('/account/newsletters')
+    cy.get('[data-testid="newsletters-grid-featured"]').then(($parentDiv) => {
       cy.intercept('POST', '/api/account/mutate', {
         statusCode: 500,
         ok: false,
@@ -62,7 +83,7 @@ describe('Newsletters page', () => {
 
       cy.contains(
         '[data-testid="toast-container"]',
-        'Sorry we were unable to sign you up to the Business newsletter, please try again'
+        'Sorry we were unable to sign you up to the Daily Briefing newsletter, please try again'
       )
     })
   })

package/cypress/e2e/account/subscription-and-billing.cy.js

@@ -134,18 +134,18 @@ describe('Subscription and billing details for Digital user', () => {
     cy.contains('[data-testid="ContentListIntroduction"]', 'Billing details')
     cy.contains('Payment method')
     cy.get('[data-testid="visa-icon"]').should('exist')
-    cy.contains('************1111')
-    cy.contains('expiry date 03/30')
+    cy.contains('************4242')
+    cy.contains('expiry date 02/27')
   })
 
-  it('Should display Invoice history section', () => {
-    cy.contains('[data-testid="ContentListIntroduction"]', 'Invoice history')
-    cy.contains('Digital pack')
-    cy.contains('20 Sept 2022')
-    cy.contains('Paid')
-    cy.get('a[data-testid="download-button"]')
-      .should('have.attr', 'href', '#')
-      .contains('View')
+  // Section no longer displayed when Invoice history is empty due to graphql change
+  // Invoices are no longer fetched if older than 1 year
+  // This test would periodically fail as it depends on changing user data
+  it('Should not display empty Invoice history section', () => {
+    cy.get('[data-testid="ContentListIntroduction"]').should(
+      'not.contain',
+      'Invoice history'
+    )
   })
 
   it('Should NOT display Your deliveries section', () => {
@@ -226,16 +226,6 @@ describe('Subscription and billing details for Print user', () => {
     )
   })
 
-  it('Should display Invoice history section', () => {
-    cy.contains('[data-testid="ContentListIntroduction"]', 'Invoice history')
-    cy.contains('Print pack')
-    cy.contains('24 Apr 2023')
-    cy.contains('Paid')
-    cy.get('a[data-testid="download-button"]')
-      .should('have.attr', 'href', '#')
-      .contains('View')
-  })
-
   it('Should display Your deliveries section for users with vouchers', () => {
     cy.GetTnlAcsSession('printVouchers')
     cy.mockConsentAndVisit('/account/subscription-and-billing')
@@ -243,8 +233,6 @@ describe('Subscription and billing details for Print user', () => {
     cy.contains('[data-testid="ContentListIntroduction"]', 'Your deliveries')
     cy.contains('Address')
     cy.contains('2 Tuke House, Cromwell Road, York, YO1 6DJ, North Yorkshire')
-    cy.contains('Delivery instructions')
-    cy.contains('On my doorstep')
     cy.contains('Holiday Stops')
     cy.contains(
       'You can pause your print delivery at any time by adding a Holiday Stop to your account. Holiday Stops need to be booked before 16:00 GMT the day before you want to pause delivery.'
@@ -277,16 +265,6 @@ describe('Subscription and billing details for Digi-Print user', () => {
     cy.contains('Digi-Print')
     //...rest is same as Print user
   })
-
-  it('Should display Invoice history section', () => {
-    cy.contains('[data-testid="ContentListIntroduction"]', 'Invoice history')
-    cy.contains('Digi-Print pack')
-    cy.contains('12 Nov 2023')
-    cy.contains('Paid')
-    cy.get('a[data-testid="download-button"]')
-      .should('have.attr', 'href', '#')
-      .contains('View')
-  })
 })
 
 describe('Subscription and billing details for Paypal user', () => {
@@ -302,15 +280,6 @@ describe('Subscription and billing details for Paypal user', () => {
     cy.get('[data-testid="paypal-icon"]').should('exist')
     cy.contains('cmp.paypal.user.verified.test@news.co.uk')
   })
-
-  it('Should show inline banner for Paypal subscription', () => {
-    cy.get('a[href="/account/payment"]').should('be.visible').click()
-    cy.contains(
-      '[data-testid="Zuora-inline"]',
-      'To update your Paypal credentials, please speak to one of our advisors on xxxx-xxx-xxxx or add a new payment method via credit/debit card using the form below.',
-      { timeout: 15000 }
-    )
-  })
 })
 
 describe('Subscription and billing edit pages', () => {

package/cypress/support/commands.js

@@ -1,4 +1,4 @@
-//Note: Check periodically if these consent cookie values exprire
+//Note: Check periodically if these consent cookie values expire
 import _ from 'lodash'
 import {
   consentUUIDValue,

package/cypress/support/users.js

@@ -54,5 +54,9 @@ export const userMap = {
     username: 'digi-print-card-15-11-22@yopmail.com',
     password: 'Password123Testing123$',
   },
-  }
-  
+  tnlNoSubscription: {
+    //registered user with no subscription, tests the number of newsletters displayed
+    username: 'tm-test+staging-registered-user@news.co.uk',
+    password: 'Growth123',
+  },
+}

package/helpers/getProviderPropsUtil.ts

@@ -0,0 +1,20 @@
+import {
+  getProviderProps,
+  getProviderPropsTimes,
+} from '@newskit-render/my-account'
+import { publisher } from '../config'
+
+export const getProviderPropsUtil = (context, options?) => {
+  if (process.env.NODE_ENV === 'development' && publisher === 'TIMES') {
+    return getProviderPropsTimes({
+      context,
+      options: {
+        ...options,
+      },
+    })
+  }
+
+  return getProviderProps(context, {
+    ...options,
+  })
+}

package/next.config.js

@@ -29,67 +29,65 @@ module.exports = (phase) => {
   }
 
   const path = require('path')
-  const withTM = require('next-transpile-modules')([
-    '@newskit-render/auth',
-    '@newskit-render/my-account',
-    '@newskit-render/validation',
-  ])
   const withBundleAnalyzer = require('@next/bundle-analyzer')({
     enabled: process.env.ANALYZE === 'true',
   })
 
-  return withBundleAnalyzer(
-    withTM({
-      webpack: (config, options) => {
-        if (options.isServer) {
-          config.externals = ['react', ...config.externals]
-        }
+  return withBundleAnalyzer({
+    transpilePackages: [
+      '@newskit-render/auth',
+      '@newskit-render/my-account',
+      '@newskit-render/validation',
+    ],
+    webpack: (config, options) => {
+      if (options.isServer) {
+        config.externals = ['react', ...config.externals]
+      }
 
-        config.resolve.alias.newskit = path.resolve(
-          __dirname,
-          '.',
-          'node_modules',
-          'newskit'
-        )
-        config.resolve.alias.react = path.resolve(
-          __dirname,
-          '.',
-          'node_modules',
-          'react'
-        )
+      config.resolve.alias.newskit = path.resolve(
+        __dirname,
+        '.',
+        'node_modules',
+        'newskit'
+      )
+      config.resolve.alias.react = path.resolve(
+        __dirname,
+        '.',
+        'node_modules',
+        'react'
+      )
 
-        return config
-      },
-      images,
-      output: 'standalone',
-      async rewrites() {
-        return [
-          {
-            source: '/sitemap.xml',
-            destination: '/api/sitemap',
-          },
-          {
-            source: '/pages-sitemap.xml',
-            destination: '/api/pages-sitemap',
-          },
-          {
-            source: '/competitions-sitemap.xml',
-            destination: '/api/competitions-sitemap',
-          },
-          {
-            source: '/news-sitemap.xml',
-            destination: '/api/news-sitemap',
-          },
-          {
-            source: '/feed',
-            destination: '/api/feed',
-          },
-          {
-            source: '/robots.txt',
-            destination: '/api/robots',
-          },
-        ]
-      },
-    })
-  )
+      return config
+    },
+    images,
+    output: 'standalone',
+    async rewrites() {
+      return [
+        {
+          source: '/sitemap.xml',
+          destination: '/api/sitemap',
+        },
+        {
+          source: '/pages-sitemap.xml',
+          destination: '/api/pages-sitemap',
+        },
+        {
+          source: '/competitions-sitemap.xml',
+          destination: '/api/competitions-sitemap',
+        },
+        {
+          source: '/news-sitemap.xml',
+          destination: '/api/news-sitemap',
+        },
+        {
+          source: '/feed',
+          destination: '/api/feed',
+        },
+        {
+          source: '/robots.txt',
+          destination: '/api/robots',
+        },
+      ]
+    },
+  })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "0.0.0-caeaa514b",
+  "version": "0.0.0-cc45b00ad",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -42,21 +42,21 @@
     "@emotion/styled": "11.9.3",
     "@newrelic/next": "0.5.2",
     "@newrelic/winston-enricher": "4.0.1",
-    "@newskit-render/api": "^1.12.2",
-    "@newskit-render/auth": "^1.8.1",
-    "@newskit-render/checkout": "^3.10.10",
-    "@newskit-render/feature-flags": "^1.10.0",
-    "@newskit-render/feed": "^1.8.10",
-    "@newskit-render/my-account": "^7.64.1",
-    "@newskit-render/shared-components": "^4.31.4",
-    "@newskit-render/standalone-components": "^3.21.10",
-    "@newskit-render/validation": "^1.17.1",
+    "@newskit-render/api": "^1.16.13",
+    "@newskit-render/auth": "^1.8.32",
+    "@newskit-render/checkout": "^3.10.69",
+    "@newskit-render/feature-flags": "^1.11.29",
+    "@newskit-render/feed": "^1.8.48",
+    "@newskit-render/my-account": "^7.110.8",
+    "@newskit-render/shared-components": "^4.47.22",
+    "@newskit-render/standalone-components": "^3.25.39",
+    "@newskit-render/validation": "^1.19.29",
     "cross-fetch": "3.1.5",
     "graphql": "16.6.0",
     "lodash.get": "4.4.2",
     "newrelic": "10.6.1",
     "newskit": "7.7.0",
-    "next": "13.4.4",
+    "next": "13.5.10",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-helmet": "6.1.0",
@@ -100,11 +100,10 @@
     "jest-junit": "15.0.0",
     "jest-watch-typeahead": "2.2.1",
     "lint-staged": "13.1.0",
-    "next-transpile-modules": "10.0.0",
     "prettier": "2.8.3",
     "prettier-eslint": "15.0.1",
     "prettier-eslint-cli": "7.1.0",
-    "typescript": "4.9.4",
+    "typescript": "5.6.3",
     "wait-on": "7.0.1"
   },
   "precommit": [

package/pages/account/add/[field].tsx

@@ -1,13 +1,10 @@
 import React from 'react'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
-import {
-  AddField,
-  addComponentMap,
-  getProviderPropsTimes,
-  // getProviderProps,
-} from '@newskit-render/my-account'
+import { AddField, addComponentMap } from '@newskit-render/my-account'
 import validation from '../../../validation'
 import { DynamicPage } from '@newskit-render/my-account'
+import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountAddField = (props) => (
   <DynamicPage
@@ -20,67 +17,27 @@ const AccountAddField = (props) => (
 )
 
 export default AccountAddField
-// export const getServerSideProps = async (context) => {
-//   const {
-//     params: { field },
-//   } = context
-//   const doesAddpageExist = Object.keys(addComponentMap).includes(field)
-//   replaceConsoleAndSetTransactionName(`Account: add ${field}`)
-
-//   if (!doesAddpageExist) {
-//     context.res.statusCode = 404
-//     // Logging the error for being captured by New Relic
-//     console.error(`An error ${context.res.statusCode} occurred on server`)
-//   }
-
-//   return {
-//     props: { data: { type: field } },
-//   }
-// }
-
 export const getServerSideProps = async (context) => {
-  // const featureFlags = await getAllFeatureFlags(
-  //   getUserAttributes(context?.req?.headers)
-  // )
-
   const {
     params: { field },
   } = context
-  const doesAddPageExist = Object.keys(addComponentMap).includes(field)
-
+  const doesAddpageExist = Object.keys(addComponentMap).includes(field)
   replaceConsoleAndSetTransactionName(`Account: add ${field}`)
 
-  const defaultPageResponse = {
-    props: { data: { type: field }, requestHeaders: context.req.headers },
-  }
-
-  const getProviderPropsResponse = (await getProviderPropsTimes({
-    ...context,
-    provider: 'AddField',
-  })) as unknown as { props: unknown }
-  console.log('getProviderPropsResponse', getProviderPropsResponse)
-
-  if (!doesAddPageExist) {
+  if (!doesAddpageExist) {
     context.res.statusCode = 404
     // Logging the error for being captured by New Relic
     console.error(`An error ${context.res.statusCode} occurred on server`)
-
-    // The 404 logic for non-existent [add] components is added in the DynamicPage
-    return defaultPageResponse
   }
 
-  const { isUserFamilyAccountPrimary } =
-    // @ts-ignore
-    getProviderPropsResponse.props.user
+  const featureFlags = await getAllFeatureFlags()
+  const providerProps = (await getProviderPropsUtil(
+    { ...context, provider: 'AddField' },
+    { featureFlags } /* cra-effected */
+  )) as unknown as { props: { data: { type: string } } }
 
-  if (field === 'family' && !isUserFamilyAccountPrimary) {
-    return {
-      redirect: {
-        permanent: false,
-        destination: '/404',
-      },
-    }
+  if (providerProps?.props) {
+    providerProps.props = { ...providerProps.props, data: { type: field } }
   }
-
-  return defaultPageResponse
+  return providerProps
 }

package/pages/account/{family → bonus-accounts}/index.tsx

@@ -1,19 +1,24 @@
 import React from 'react'
-import { Family, getProviderPropsTimes } from '@newskit-render/my-account'
+import { Family } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountFamily = (props) => <Family {...props} />
 
 export default AccountFamily
 
 export const getServerSideProps = async (context) => {
-  replaceConsoleAndSetTransactionName('Account: Family')
+  replaceConsoleAndSetTransactionName('Account: Bonus Accounts')
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
+
   /* end cra-effected */
-  return getProviderPropsTimes(
-    { ...context, provider: 'GroupAccounts' },
+  return getProviderPropsUtil(
+    {
+      ...context,
+      provider: 'GroupAccountsV2',
+    },
     { featureFlags } /* cra-effected */
   )
 }

package/pages/account/cancellation/index.tsx

@@ -1,8 +1,9 @@
 import React from 'react'
-import { Cancellation, getProviderProps } from '@newskit-render/my-account'
+import { Cancellation } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 import validation from '../../../validation'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountCancellation = (props) => (
   <Cancellation {...props} validation={validation} />
@@ -15,7 +16,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'Cancellation' },
     { featureFlags } /* cra-effected */
   )