@newskit-render/core 4.27.1 → 4.27.2-alpha.0

package/cypress/e2e/account/personal-details.cy.js

@@ -317,44 +317,7 @@ describe('Personal detail edit pages', () => {
         expect(loc.pathname).to.eq('/account')
       })
     })
-    it('Should change user email', () => {
-      const currentEmail = 'cmp-digi-card-20-09-22@yopmail.com'
-      const notRegistredEmail = 'not-registered-email@yopmail.com'
-
-      cy.get('a[href="/account/edit/email"]').should('be.visible').click()
-
-      cy.get('[name="email"]').clear()
-      cy.get('[name="email"]').type(notRegistredEmail)
-      cy.get('[data-testid="primary-button"]').click()
-
-      cy.contains('[data-testid="toast-container"]', 'Updating your email...')
 
-      // Redirects to Personal details page
-      cy.location().should((loc) => {
-        expect(loc.pathname).to.eq('/account')
-      })
-      cy.contains(notRegistredEmail).should('have.length', 1)
-      cy.contains(
-        '[data-testid="toast-container"]',
-        'Your email address was successfully updated'
-      )
-
-      // Back to edit email page
-
-      cy.get('a[href="/account/edit/email"]')
-        .should('be.visible')
-        .click({ force: true })
-
-      // Check the message for verification link
-      cy.contains(
-        `Email sent to ${notRegistredEmail} with a verification link. If you haven't received it yet, check again later or contact customer services on xxxx-xxx-xxxx`
-      )
-
-      // Change email back to the previous email
-      cy.get('[name="email"]').clear()
-      cy.get('[name="email"]').type(currentEmail)
-      cy.get('[data-testid="primary-button"]').click()
-    })
     it('Should NOT change user email if input value is already registered mail', () => {
       const alreadyRegistredEmail = 'cmp-digi-direct-20-09-22@yopmail.com'
 
@@ -370,6 +333,7 @@ describe('Personal detail edit pages', () => {
         'This email address is already in use. Try a different one or contact customer support at 1234-1234'
       )
     })
+
     it('Should show input validation error messages when user tries to add invalid email', () => {
       cy.get('a[href="/account/edit/email"]').should('be.visible').click()
 
@@ -391,6 +355,7 @@ describe('Personal detail edit pages', () => {
         'Updating your email...'
       ).should('not.exist')
     })
+
     it('Should show error toast when updating email if internal server error occures', () => {
       cy.intercept('POST', '/api/account/mutate', { statusCode: 500 })
 
@@ -406,6 +371,45 @@ describe('Personal detail edit pages', () => {
         "Sorry, we're unable to save your email right now. Please try again or come back later."
       )
     })
+
+    it('Should change user email', () => {
+      const currentEmail = 'cmp-digi-card-20-09-22@yopmail.com'
+      const notRegistredEmail = 'not-registered-email@yopmail.com'
+
+      cy.get('a[href="/account/edit/email"]').should('be.visible').click()
+
+      cy.get('[name="email"]').clear()
+      cy.get('[name="email"]').type(notRegistredEmail)
+      cy.get('[data-testid="primary-button"]').click()
+
+      cy.contains('[data-testid="toast-container"]', 'Updating your email...')
+
+      // Redirects to Personal details page
+      cy.location().should((loc) => {
+        expect(loc.pathname).to.eq('/account')
+      })
+      cy.contains(notRegistredEmail).should('have.length', 1)
+      cy.contains(
+        '[data-testid="toast-container"]',
+        'Your email address was successfully updated'
+      )
+
+      // Back to edit email page
+
+      cy.get('a[href="/account/edit/email"]')
+        .should('be.visible')
+        .click({ force: true })
+
+      // Check the message for verification link
+      cy.contains(
+        `Email sent to ${notRegistredEmail} with a verification link. If you haven't received it yet, check again later or contact customer services on xxxx-xxx-xxxx`
+      )
+
+      // Change email back to the previous email
+      cy.get('[name="email"]').clear()
+      cy.get('[name="email"]').type(currentEmail)
+      cy.get('[data-testid="primary-button"]').click()
+    })
   })
 
   describe('Edit password', () => {

package/cypress/support/commands.js

@@ -60,13 +60,13 @@ Cypress.Commands.add('GetTnlAcsSession', (user = 'tnl') => {
 
   cy.request({
     method: 'POST',
-    url: 'https://login.staging-thetimes.co.uk/services/session',
+    url: 'https://login.staging-thetimes.com/services/session',
     headers: {
       'Content-Type': 'application/vnd.newsuk.acs.createsession-v1+json',
     },
     body: {
       rememberMe: false,
-      gotoUrl: 'https://login.staging-thetimes.co.uk/',
+      gotoUrl: 'https://login.staging-thetimes.com/',
       sso: false,
       authCredentials: {
         username,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "4.27.1",
+  "version": "4.27.2-alpha.0",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -44,12 +44,12 @@
     "@newrelic/winston-enricher": "4.0.1",
     "@newskit-render/api": "^1.12.1",
     "@newskit-render/auth": "^1.8.0",
-    "@newskit-render/checkout": "^3.9.34",
-    "@newskit-render/feature-flags": "^1.8.0",
+    "@newskit-render/checkout": "^3.9.35-alpha.0",
+    "@newskit-render/feature-flags": "^1.8.2-alpha.0",
     "@newskit-render/feed": "^1.8.9",
-    "@newskit-render/my-account": "^7.54.0",
-    "@newskit-render/shared-components": "^4.28.0",
-    "@newskit-render/standalone-components": "^3.20.27",
+    "@newskit-render/my-account": "^7.55.0-alpha.0",
+    "@newskit-render/shared-components": "^4.28.1-alpha.0",
+    "@newskit-render/standalone-components": "^3.20.28-alpha.0",
     "@newskit-render/validation": "^1.17.0",
     "cross-fetch": "3.1.5",
     "graphql": "16.6.0",

package/pages/account/cancellation/index.tsx

@@ -1,8 +1,7 @@
 import React from 'react'
 import { Cancellation, getProviderProps } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
-import { initAndGetFeatureFlag } from '@newskit-render/feature-flags' /* cra-effected */
-import { optimizelysdkKey } from '../../../config' /* cra-effected */
+import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
 import validation from '../../../validation'
 
 const AccountCancellation = (props) => (
@@ -14,7 +13,7 @@ export default AccountCancellation
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Cancellation')
   /* start cra-effected */
-  const featureFlags = await initAndGetFeatureFlag(optimizelysdkKey)
+  const featureFlags = await getFlagsAll()
   /* end cra-effected */
   return getProviderProps(
     { ...context, provider: 'Cancellation' },

package/pages/account/dream-team/index.tsx

@@ -1,8 +1,7 @@
 import React from 'react'
 import { DreamTeam, getProviderProps } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
-import { initAndGetFeatureFlag } from '@newskit-render/feature-flags' /* cra-effected */
-import { optimizelysdkKey } from '../../../config' /* cra-effected */
+import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
 
 const AccountNewslettersAndAlerts = (props) => <DreamTeam {...props} />
 
@@ -11,7 +10,7 @@ export default AccountNewslettersAndAlerts
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Dream Team')
   /* start cra-effected */
-  const featureFlags = await initAndGetFeatureFlag(optimizelysdkKey)
+  const featureFlags = await getFlagsAll()
   /* end cra-effected */
   return getProviderProps(
     { ...context, provider: 'DreamTeam' },

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

@@ -6,8 +6,7 @@ import {
   editComponentMap,
   DynamicPage,
 } from '@newskit-render/my-account'
-import { initAndGetFeatureFlag } from '@newskit-render/feature-flags' /* cra-effected */
-import { optimizelysdkKey } from '../../../config' /* cra-effected */
+import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
 import validation from '../../../validation'
 
 const AccountEditField = (props) => (
@@ -36,7 +35,7 @@ export const getServerSideProps = async (context) => {
     console.error(`An error ${context.res.statusCode} occurred on server`)
   }
   /* start cra-effected */
-  const featureFlags = await initAndGetFeatureFlag(optimizelysdkKey)
+  const featureFlags = await getFlagsAll()
   /* end cra-effected */
 
   return getProviderProps(

package/pages/account/family/index.tsx

@@ -1,8 +1,7 @@
 import React from 'react'
 import { Family, getProviderProps } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
-import { initAndGetFeatureFlag } from '@newskit-render/feature-flags' /* cra-effected */
-import { optimizelysdkKey } from '../../../config' /* cra-effected */
+import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
 
 const AccountFamily = (props) => <Family {...props} />
 
@@ -11,7 +10,7 @@ export default AccountFamily
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Family')
   /* start cra-effected */
-  const featureFlags = await initAndGetFeatureFlag(optimizelysdkKey)
+  const featureFlags = await getFlagsAll()
   /* end cra-effected */
   return getProviderProps(
     { ...context, provider: 'GroupAccounts' },

package/pages/account/holiday-stop/index.tsx

@@ -1,8 +1,7 @@
 import React from 'react'
 import { getProviderProps, HolidayStop } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
-import { initAndGetFeatureFlag } from '@newskit-render/feature-flags' /* cra-effected */
-import { optimizelysdkKey } from '../../../config' /* cra-effected */
+import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
 
 const AccountHolidayStop = (props) => <HolidayStop {...props} />
 
@@ -11,7 +10,7 @@ export default AccountHolidayStop
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Book a Holiday Stop')
   /* start cra-effected */
-  const featureFlags = await initAndGetFeatureFlag(optimizelysdkKey)
+  const featureFlags = await getFlagsAll()
   /* end cra-effected */
   return getProviderProps(
     { ...context, provider: 'HolidayStop' },

package/pages/account/index.tsx

@@ -1,9 +1,9 @@
 import React from 'react'
 import { PersonalDetails, getProviderProps } from '@newskit-render/my-account'
-import { initAndGetFeatureFlag } from '@newskit-render/feature-flags' /* cra-effected */
-import { optimizelysdkKey } from '../../config' /* cra-effected */
+import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
 import { AccountDropdown } from '../../components/AccountDropdown' /* cra-disabled */
 import { replaceConsoleAndSetTransactionName } from '../../helpers/logger'
+import { closeFlagsInstance } from '@newskit-render/feature-flags'
 
 const AccountPersonalDetails = (props) => {
   return (
@@ -21,11 +21,11 @@ const AccountPersonalDetails = (props) => {
 export default AccountPersonalDetails
 
 export const getServerSideProps = async (context) => {
-  /* start cra-effected */
-  const featureFlags = await initAndGetFeatureFlag(optimizelysdkKey)
-
-  /* end cra-effected */
   replaceConsoleAndSetTransactionName('Account: Personal details')
+
+  const featureFlags = await getFlagsAll()
+  await closeFlagsInstance()
+
   return getProviderProps(
     { ...context, provider: 'PersonalDetails' },
     { featureFlags } /* cra-effected */

package/pages/account/newsletters/index.tsx

@@ -1,8 +1,7 @@
 import React from 'react'
 import { Newsletters, getProviderProps } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
-import { initAndGetFeatureFlag } from '@newskit-render/feature-flags' /* cra-effected */
-import { optimizelysdkKey } from '../../../config' /* cra-effected */
+import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
 
 const AccountNewsletters = (props) => <Newsletters {...props} />
 
@@ -11,7 +10,7 @@ export default AccountNewsletters
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Newsletters')
   /* start cra-effected */
-  const featureFlags = await initAndGetFeatureFlag(optimizelysdkKey)
+  const featureFlags = await getFlagsAll()
   /* end cra-effected */
   return getProviderProps(
     { ...context, provider: 'Newsletters' },

package/pages/account/newsletters-and-alerts/index.tsx

@@ -4,8 +4,7 @@ import {
   getProviderProps,
 } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
-import { initAndGetFeatureFlag } from '@newskit-render/feature-flags' /* cra-effected */
-import { optimizelysdkKey } from '../../../config' /* cra-effected */
+import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
 
 const AccountNewslettersAndAlerts = (props) => (
   <NewslettersAndAlerts {...props} />
@@ -16,7 +15,7 @@ export default AccountNewslettersAndAlerts
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Newsletters and Alerts')
   /* start cra-effected */
-  const featureFlags = await initAndGetFeatureFlag(optimizelysdkKey)
+  const featureFlags = await getFlagsAll()
   /* end cra-effected */
   return getProviderProps(
     { ...context, provider: 'NewslettersAndAlerts' },

package/pages/account/payment/[paymentMethod].tsx

@@ -6,8 +6,7 @@ import {
   paymentMethodsMap,
   DynamicPage,
 } from '@newskit-render/my-account'
-import { initAndGetFeatureFlag } from '@newskit-render/feature-flags' /* cra-effected */
-import { optimizelysdkKey } from '../../../config' /* cra-effected */
+import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
 
 const PaymentPage = (props) => {
   return (
@@ -25,7 +24,7 @@ export default PaymentPage
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Payment method')
   /* start cra-effected */
-  const featureFlags = await initAndGetFeatureFlag(optimizelysdkKey)
+  const featureFlags = await getFlagsAll()
   /* end cra-effected */
 
   return getProviderProps(

package/pages/account/payment/index.tsx

@@ -1,8 +1,7 @@
 import React from 'react'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { Payment, getProviderProps } from '@newskit-render/my-account'
-import { initAndGetFeatureFlag } from '@newskit-render/feature-flags' /* cra-effected */
-import { optimizelysdkKey } from '../../../config' /* cra-effected */
+import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
 
 const AccountPayment = (props) => <Payment {...props} />
 
@@ -11,7 +10,7 @@ export default AccountPayment
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Edit Payment method')
   /* start cra-effected */
-  const featureFlags = await initAndGetFeatureFlag(optimizelysdkKey)
+  const featureFlags = await getFlagsAll()
   /* end cra-effected */
 
   return getProviderProps(

package/pages/account/payment-methods/index.tsx

@@ -1,7 +1,6 @@
 import React from 'react'
 import { getProviderProps, PaymentMethods } from '@newskit-render/my-account'
-import { initAndGetFeatureFlag } from '@newskit-render/feature-flags' // create-render-app effected
-import { optimizelysdkKey } from '../../../config' // create-render-app effected
+import { getFlagsAll } from '@newskit-render/feature-flags' // create-render-app effected
 import { paymentMethodContext } from '../../../context/app-context/paymentMethodContext'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 
@@ -13,7 +12,8 @@ export default AccountPaymentMethods
 
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Payment Methods')
-  const featureFlags = await initAndGetFeatureFlag(optimizelysdkKey) // create-render-app effected
+  const featureFlags = await getFlagsAll()
+  // create-render-app effected
   return getProviderProps(
     { ...context, provider: 'PaymentMethods' },
     { featureFlags } // create-render-app effected

package/pages/account/subscription-and-billing/index.tsx

@@ -3,8 +3,7 @@ import {
   SubscriptionAndBilling,
   getProviderProps,
 } from '@newskit-render/my-account'
-import { initAndGetFeatureFlag } from '@newskit-render/feature-flags' /* cra-effected */
-import { optimizelysdkKey } from '../../../config' /* cra-effected */
+import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 
 const AccountSubscriptionAndBilling = (props) => (
@@ -16,7 +15,7 @@ export default AccountSubscriptionAndBilling
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Subscription and Billing')
   /* start cra-effected */
-  const featureFlags = await initAndGetFeatureFlag(optimizelysdkKey)
+  const featureFlags = await getFlagsAll()
   /* end cra-effected */
   const result = await getProviderProps(
     {