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

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

@@ -307,7 +307,8 @@ describe('Subscription and billing details for Paypal user', () => {
     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.'
+      '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 }
     )
   })
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "0.0.0-b7fba40c6",
+  "version": "0.0.0-caeaa514b",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",

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

@@ -1,6 +1,11 @@
 import React from 'react'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
-import { AddField, addComponentMap } from '@newskit-render/my-account'
+import {
+  AddField,
+  addComponentMap,
+  getProviderPropsTimes,
+  // getProviderProps,
+} from '@newskit-render/my-account'
 import validation from '../../../validation'
 import { DynamicPage } from '@newskit-render/my-account'
 
@@ -15,20 +20,67 @@ 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}`)
 
-  if (!doesAddpageExist) {
+  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) {
     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
   }
 
-  return {
-    props: { data: { type: field } },
+  const { isUserFamilyAccountPrimary } =
+    // @ts-ignore
+    getProviderPropsResponse.props.user
+
+  if (field === 'family' && !isUserFamilyAccountPrimary) {
+    return {
+      redirect: {
+        permanent: false,
+        destination: '/404',
+      },
+    }
   }
+
+  return defaultPageResponse
 }

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

@@ -2,7 +2,8 @@ import React from 'react'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import {
   EditField,
-  getProviderProps,
+  // getProviderProps,
+  getProviderPropsTimes,
   editComponentMap,
   DynamicPage,
 } from '@newskit-render/my-account'
@@ -38,7 +39,7 @@ export const getServerSideProps = async (context) => {
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
 
-  return getProviderProps(
+  return getProviderPropsTimes(
     { ...context, provider: 'EditField' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/family/index.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Family, getProviderProps } from '@newskit-render/my-account'
+import { Family, getProviderPropsTimes } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 
@@ -12,7 +12,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsTimes(
     { ...context, provider: 'GroupAccounts' },
     { featureFlags } /* cra-effected */
   )

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

@@ -1,5 +1,9 @@
 import React from 'react'
-import { getProviderProps, HolidayStop } from '@newskit-render/my-account'
+import {
+  // getProviderProps,
+  getProviderPropsTimes,
+  HolidayStop,
+} from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 
@@ -12,7 +16,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsTimes(
     { ...context, provider: 'HolidayStop' },
     { featureFlags } /* cra-effected */
   )

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

@@ -1,5 +1,9 @@
 import React from 'react'
-import { getProviderProps, HolidayStopList } from '@newskit-render/my-account'
+import {
+  // getProviderProps,
+  getProviderPropsTimes,
+  HolidayStopList,
+} from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { holidayStopListContextOverrides } from '../../../context/app-context/holidayStopListContextOverrides'
 
@@ -15,5 +19,5 @@ export default AccountPreviousHolidayStops
 
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Previous Holiday Stops')
-  return getProviderProps({ ...context, provider: 'HolidayStop' })
+  return getProviderPropsTimes({ ...context, provider: 'HolidayStop' })
 }

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

@@ -1,5 +1,9 @@
 import React from 'react'
-import { getProviderProps, HolidayStopList } from '@newskit-render/my-account'
+import {
+  // getProviderProps,
+  getProviderPropsTimes,
+  HolidayStopList,
+} from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { holidayStopListContextOverrides } from '../../../context/app-context/holidayStopListContextOverrides'
 
@@ -15,5 +19,5 @@ export default AccountUpcomingHolidayStops
 
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Upcoming Holiday Stops')
-  return getProviderProps({ ...context, provider: 'HolidayStop' })
+  return getProviderPropsTimes({ ...context, provider: 'HolidayStop' })
 }

package/pages/account/index.tsx

@@ -1,5 +1,9 @@
 import React from 'react'
-import { PersonalDetails, getProviderProps } from '@newskit-render/my-account'
+import {
+  PersonalDetails,
+  getProviderPropsTimes,
+  // getProviderProps,
+} from '@newskit-render/my-account'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 import { AccountDropdown } from '../../components/AccountDropdown' /* cra-disabled */
 import { replaceConsoleAndSetTransactionName } from '../../helpers/logger'
@@ -24,7 +28,7 @@ export const getServerSideProps = async (context) => {
 
   const featureFlags = await getAllFeatureFlags()
 
-  return getProviderProps(
+  return getProviderPropsTimes(
     { ...context, provider: 'PersonalDetails' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/newsletters/index.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Newsletters, getProviderProps } from '@newskit-render/my-account'
+import { Newsletters, getProviderPropsTimes } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 
@@ -12,7 +12,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsTimes(
     { ...context, provider: 'Newsletters' },
     { featureFlags } /* cra-effected */
   )

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

@@ -1,7 +1,8 @@
 import React from 'react'
 import {
   NewslettersAndAlerts,
-  getProviderProps,
+  getProviderPropsTimes,
+  // getProviderProps
 } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
@@ -17,7 +18,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsTimes(
     { ...context, provider: 'NewslettersAndAlerts' },
     { featureFlags } /* cra-effected */
   )

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

@@ -1,7 +1,8 @@
 import React from 'react'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import {
-  getProviderProps,
+  // getProviderProps,
+  getProviderPropsTimes,
   Payment,
   paymentMethodsMap,
   DynamicPage,
@@ -27,7 +28,7 @@ export const getServerSideProps = async (context) => {
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
 
-  return getProviderProps(
+  return getProviderPropsTimes(
     {
       ...context,
       provider: 'Payment',

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

@@ -1,5 +1,9 @@
 import React from 'react'
-import { getProviderProps, PaymentMethods } from '@newskit-render/my-account'
+import {
+  // getProviderProps,
+  getProviderPropsTimes,
+  PaymentMethods,
+} from '@newskit-render/my-account'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' // create-render-app effected
 import { paymentMethodContext } from '../../../context/app-context/paymentMethodContext'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
@@ -14,7 +18,7 @@ export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Payment Methods')
   const featureFlags = await getAllFeatureFlags()
   // create-render-app effected
-  return getProviderProps(
+  return getProviderPropsTimes(
     { ...context, provider: 'PaymentMethods' },
     { featureFlags } // create-render-app effected
   )

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

@@ -1,7 +1,8 @@
 import React from 'react'
 import {
   SubscriptionAndBilling,
-  getProviderProps,
+  getProviderPropsTimes,
+  // getProviderProps,
 } from '@newskit-render/my-account'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
@@ -17,7 +18,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  const result = await getProviderProps(
+  const result = await getProviderPropsTimes(
     {
       ...context,
       provider: 'SubscriptionAndBilling',