@newskit-render/core 0.0.0-be4e90261 → 0.0.0-c6fd35d9d

package/CHANGELOG.md

@@ -3,6 +3,238 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.41.13](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.13-alpha.0...@newskit-render/core@4.41.13) (2025-01-30)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.12](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.12-alpha.0...@newskit-render/core@4.41.12) (2025-01-30)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.11](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.11-alpha.0...@newskit-render/core@4.41.11) (2025-01-29)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.10](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.10-alpha.0...@newskit-render/core@4.41.10) (2025-01-28)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.9](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.9-alpha.0...@newskit-render/core@4.41.9) (2025-01-28)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.8](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.8-alpha.0...@newskit-render/core@4.41.8) (2025-01-28)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.7](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.7-alpha.0...@newskit-render/core@4.41.7) (2025-01-28)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.6](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.6-alpha.0...@newskit-render/core@4.41.6) (2025-01-27)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.5](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.5-alpha.0...@newskit-render/core@4.41.5) (2025-01-22)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.4-alpha.1...@newskit-render/core@4.41.4) (2025-01-22)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.3-alpha.0...@newskit-render/core@4.41.3) (2025-01-17)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.1...@newskit-render/core@4.41.2) (2025-01-16)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.41.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.1-alpha.5...@newskit-render/core@4.41.1) (2025-01-16)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [4.41.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.41.0-alpha.0...@newskit-render/core@4.41.0) (2025-01-13)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.40.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.40.3-alpha.0...@newskit-render/core@4.40.3) (2025-01-08)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.40.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.40.2-alpha.0...@newskit-render/core@4.40.2) (2025-01-07)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.40.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.40.1-alpha.0...@newskit-render/core@4.40.1) (2025-01-06)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [4.40.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.40.0-alpha.0...@newskit-render/core@4.40.0) (2024-12-12)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.39.10](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.39.10-alpha.0...@newskit-render/core@4.39.10) (2024-12-05)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.39.9](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.39.9-alpha.0...@newskit-render/core@4.39.9) (2024-12-03)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.39.8](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.39.8-alpha.0...@newskit-render/core@4.39.8) (2024-12-02)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.39.7](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.39.7-alpha.0...@newskit-render/core@4.39.7) (2024-11-28)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.39.6](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.39.6-alpha.0...@newskit-render/core@4.39.6) (2024-11-27)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.39.5](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.39.5-alpha.0...@newskit-render/core@4.39.5) (2024-11-26)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.39.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.39.4-alpha.0...@newskit-render/core@4.39.4) (2024-11-25)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.39.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.39.3-alpha.0...@newskit-render/core@4.39.3) (2024-11-21)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.39.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.39.2-alpha.0...@newskit-render/core@4.39.2) (2024-11-18)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+## [4.39.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.39.1-alpha.2...@newskit-render/core@4.39.1) (2024-11-13)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [4.39.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.39.0-alpha.0...@newskit-render/core@4.39.0) (2024-11-12)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
 ## [4.38.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.38.4-alpha.0...@newskit-render/core@4.38.4) (2024-11-06)
 
 **Note:** Version bump only for package @newskit-render/core

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/cypress/e2e/account/newsletters-page.cy.js

@@ -1,54 +1,52 @@
-import {
-  // registration_blaize_jwt,
-  subscription_blaize_jwt,
-} from '../../support/blaizeJwtValues'
-
 describe('Newsletters page', () => {
   beforeEach(() => {
     cy.GetTnlAcsSession()
     cy.mockConsent()
   })
 
-  it('Should display all the newsletters on the newsletters page when user is subscribed', () => {
-    cy.mockBlaizeJwtAndVisit(subscription_blaize_jwt, '/account/newsletters')
+  it('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',
-      20
+      21
     )
   })
 
-  // Commented out because Optimizely feature flag with tm-my-account key is causing it to fail in this repo. Test should be re-enabled once feature flag is removed.
-  // it('Should only display selected newsletters on the newsletters page when user is registered', () => {
-  //   cy.mockBlaizeJwtAndVisit(registration_blaize_jwt, '/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', 12)
-  // })
+  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 > div').should(
+      'have.length',
+      5
+    )
+  })
 
   it('Should display all required newsletter text in the first grid card', () => {
-    cy.mockBlaizeJwtAndVisit(subscription_blaize_jwt, '/account/newsletters')
-    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.mockBlaizeJwtAndVisit(subscription_blaize_jwt, '/account/newsletters')
-    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')
@@ -61,14 +59,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.mockBlaizeJwtAndVisit(subscription_blaize_jwt, '/account/newsletters')
-    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,
@@ -84,7 +82,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

@@ -138,15 +138,14 @@ describe('Subscription and billing details for Digital user', () => {
     cy.contains('expiry date 02/27')
   })
 
-  // Skipped due to graphql changes. To be fixed with TMR-1959
-  it.skip('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', () => {
@@ -227,17 +226,6 @@ describe('Subscription and billing details for Print user', () => {
     )
   })
 
-  // Skipped due to graphql changes. To be fixed with TMR-1959
-  it.skip('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')
@@ -279,18 +267,6 @@ describe('Subscription and billing details for Digi-Print user', () => {
     cy.contains('Digi-Print')
     //...rest is same as Print user
   })
-
-  // This test is going to fail on 13.11.2024 due to graphql changes.
-  // To be fixed with TMR-1959
-  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', () => {

package/cypress/support/commands.js

@@ -31,11 +31,6 @@ Cypress.Commands.add('mockConsent', () => {
   setConsentLocalStorage()
 })
 
-Cypress.Commands.add('mockBlaizeJwtAndVisit', (jwtValue, url) => {
-  cy.setCookie('blaize_jwt', jwtValue)
-  cy.visit(url)
-})
-
 Cypress.Commands.add('GetAcsSession', (user = 'default') => {
   const { username, password } = userMap[user]
 

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "0.0.0-be4e90261",
+  "version": "0.0.0-c6fd35d9d",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -42,15 +42,15 @@
     "@emotion/styled": "11.9.3",
     "@newrelic/next": "0.5.2",
     "@newrelic/winston-enricher": "4.0.1",
-    "@newskit-render/api": "^1.14.2",
-    "@newskit-render/auth": "^1.8.2",
-    "@newskit-render/checkout": "^3.10.23-alpha.0",
-    "@newskit-render/feature-flags": "^1.11.1",
-    "@newskit-render/feed": "^1.8.15",
-    "@newskit-render/my-account": "^7.83.2-alpha.0",
-    "@newskit-render/shared-components": "^4.35.2-alpha.0",
-    "@newskit-render/standalone-components": "^3.23.6-alpha.0",
-    "@newskit-render/validation": "^1.18.1",
+    "@newskit-render/api": "^1.15.2",
+    "@newskit-render/auth": "^1.8.4",
+    "@newskit-render/checkout": "^3.10.35",
+    "@newskit-render/feature-flags": "^1.11.3",
+    "@newskit-render/feed": "^1.8.18",
+    "@newskit-render/my-account": "^7.98.4",
+    "@newskit-render/shared-components": "^4.44.0",
+    "@newskit-render/standalone-components": "^3.25.5",
+    "@newskit-render/validation": "^1.18.4",
     "cross-fetch": "3.1.5",
     "graphql": "16.6.0",
     "lodash.get": "4.4.2",

package/pages/account/user-hub/index.tsx

@@ -14,7 +14,7 @@ export const getServerSideProps = async (context) => {
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
   return getProviderPropsUtil(
-    { ...context, provider: 'Newsletters' },
+    { ...context, provider: 'UserHub' },
     { featureFlags } /* cra-effected */
   )
 }

package/cypress/support/blaizeJwtValues.js

@@ -1,3 +0,0 @@
-export const subscription_blaize_jwt = 'eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ7XCJjcG5cIjpcIkFBQUEwMjU1OTcwNDVcIixcInByb2R1Y3RzXCI6W1wiVGhlIFRpbWVzIFNpdGUgUHJvZHVjdFwiLFwiVGltZXMgU3BvcnRzIEFwcFwiLFwiVGhlIFRpbWVzIEVQTCBWaWRlbyBQcm9kdWN0XCIsXCJUaGUgU3VuZGF5IFRpbWVzIGlQaG9uZSBhcHAgcHJvZHVjdFwiLFwiRW1haWwgQnVsbGV0aW5zIFByb2R1Y3RcIixcIlRoZSBTdW5kYXkgVGltZXMgTW9iaSBQcm9kdWN0XCIsXCJUaGUgU3VuZGF5IFRpbWVzIGlQYWQgYXBwIHByb2R1Y3RcIixcImUtcGFwZXIgUHJvZHVjdFwiLFwiRGFpbHkgQ3Jvc3N3b3JkIFByb2R1Y3RcIixcIlRoZSBTdW5kYXkgVGltZXMgU2l0ZSBQcm9kdWN0XCIsXCJUaGUgVGltZXMgTW9iaSBQcm9kdWN0XCIsXCJUaGUgVGltZXMgaVBhZCBhcHAgUHJvZHVjdFwiLFwiRGlnaXRhbCBTdWJzY3JpcHRpb24gUHJvZHVjdFwiLFwiVGhlIFRpbWVzIGlQaG9uZSBhcHAgcHJvZHVjdFwiLFwiVGltZXMrIG1lbWJlcnNoaXAgYmVuZWZpdHMgUHJvZHVjdFwiXX0iLCJodHRwczpcL1wvdGhldGltZXMuY28udWtcL2NwbiI6IkFBQUEwMjU1OTcwNDUiLCJodHRwczpcL1wvdGhldGltZXMuY28udWtcL3N1YnNjcmlwdGlvbiI6IlNVQi0wMDEwOTcyNjQ0IiwiaXNzIjoiLnRoZXRpbWVzLmNvbSIsImh0dHBzOlwvXC90aGV0aW1lcy5jby51a1wvcHJvZHVjdHMiOlsiVGhlIFRpbWVzIFNpdGUgUHJvZHVjdCIsIlRpbWVzIFNwb3J0cyBBcHAiLCJUaGUgVGltZXMgRVBMIFZpZGVvIFByb2R1Y3QiLCJUaGUgU3VuZGF5IFRpbWVzIGlQaG9uZSBhcHAgcHJvZHVjdCIsIkVtYWlsIEJ1bGxldGlucyBQcm9kdWN0IiwiVGhlIFN1bmRheSBUaW1lcyBNb2JpIFByb2R1Y3QiLCJUaGUgU3VuZGF5IFRpbWVzIGlQYWQgYXBwIHByb2R1Y3QiLCJlLXBhcGVyIFByb2R1Y3QiLCJEYWlseSBDcm9zc3dvcmQgUHJvZHVjdCIsIlRoZSBTdW5kYXkgVGltZXMgU2l0ZSBQcm9kdWN0IiwiVGhlIFRpbWVzIE1vYmkgUHJvZHVjdCIsIlRoZSBUaW1lcyBpUGFkIGFwcCBQcm9kdWN0IiwiRGlnaXRhbCBTdWJzY3JpcHRpb24gUHJvZHVjdCIsIlRoZSBUaW1lcyBpUGhvbmUgYXBwIHByb2R1Y3QiLCJUaW1lcysgbWVtYmVyc2hpcCBiZW5lZml0cyBQcm9kdWN0Il0sImV4cCI6MTcxNjk4ODc3OSwiaWF0IjoxNzE2MzgzOTc5fQ.JTqe7UJo985At-2JkuMrH-6H__qzwZwBGRnEJXl4CSM'
-
-export const registration_blaize_jwt = 'eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ7XCJjcG5cIjpcIkNQTi1YNlpOWFBRUlFcIixcInByb2R1Y3RzXCI6W119IiwiaHR0cHM6XC9cL3RoZXRpbWVzLmNvLnVrXC9jcG4iOiJDUE4tWDZaTlhQUVJRIiwiaHR0cHM6XC9cL3RoZXRpbWVzLmNvLnVrXC9zdWJzY3JpcHRpb24iOiJFR0FDQy1DUzAwMDAxMzQ0NjI4IiwiaXNzIjoiLnRoZXRpbWVzLmNvLnVrIiwiaHR0cHM6XC9cL3RoZXRpbWVzLmNvLnVrXC9wcm9kdWN0cyI6W10sImV4cCI6MTcyNTQ1NDgwNCwiaWF0IjoxNzI0ODUwMDA0fQ.XGTv2XooQ8VELZsc7bl35D0A9FlOvEWpexNlYpCCK1Q'