@newskit-render/core 0.0.0-e16014a0 → 0.0.0-e314136b0

package/pages/account/bonus-accounts/index.tsx

@@ -0,0 +1,24 @@
+import React from 'react'
+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: Bonus Accounts')
+  /* start cra-effected */
+  const featureFlags = await getAllFeatureFlags()
+
+  /* end cra-effected */
+  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 { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
+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} />
@@ -13,9 +14,9 @@ export default AccountCancellation
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Cancellation')
   /* start cra-effected */
-  const featureFlags = await getFlagsAll()
+  const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'Cancellation' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/delete/confirm/index.tsx

@@ -1,9 +1,7 @@
 import React from 'react'
-import {
-  ConfirmAccountDeletion,
-  getProviderProps,
-} from '@newskit-render/my-account'
+import { ConfirmAccountDeletion } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../../helpers/getProviderPropsUtil'
 
 const ConfirmDeletion = (props) => <ConfirmAccountDeletion {...props} />
 
@@ -12,5 +10,5 @@ export default ConfirmDeletion
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Deletion - Confirmation')
 
-  return getProviderProps({ ...context })
+  return getProviderPropsUtil({ ...context })
 }

package/pages/account/delete/error/index.tsx

@@ -1,9 +1,7 @@
 import React from 'react'
-import {
-  AccountDeletionError,
-  getProviderProps,
-} from '@newskit-render/my-account'
+import { AccountDeletionError } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../../helpers/getProviderPropsUtil'
 
 const Error = (props) => <AccountDeletionError {...props} />
 
@@ -12,5 +10,5 @@ export default Error
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Deletion - Error')
 
-  return getProviderProps({ ...context })
+  return getProviderPropsUtil({ ...context })
 }

package/pages/account/delete/index.tsx

@@ -1,9 +1,7 @@
 import React from 'react'
-import {
-  InitiateAccountDeletion,
-  getProviderProps,
-} from '@newskit-render/my-account'
+import { InitiateAccountDeletion } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountDeletion = (props) => <InitiateAccountDeletion {...props} />
 
@@ -12,5 +10,5 @@ export default AccountDeletion
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Deletion')
 
-  return getProviderProps({ ...context })
+  return getProviderPropsUtil({ ...context })
 }

package/pages/account/delete/success/index.tsx

@@ -1,9 +1,7 @@
 import React from 'react'
-import {
-  AccountDeletionSuccess,
-  getProviderProps,
-} from '@newskit-render/my-account'
+import { AccountDeletionSuccess } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../../helpers/getProviderPropsUtil'
 
 const Success = (props) => <AccountDeletionSuccess {...props} />
 
@@ -12,5 +10,5 @@ export default Success
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Deletion - Success')
 
-  return getProviderProps({ ...context })
+  return getProviderPropsUtil({ ...context })
 }

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

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

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

@@ -2,16 +2,20 @@ import React from 'react'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import {
   EditField,
-  getProviderProps,
   editComponentMap,
+  broadcastingOnlyEditComponentMap,
   DynamicPage,
 } from '@newskit-render/my-account'
-import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
+import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 import validation from '../../../validation'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
+import { publisher } from '../../../config'
+import { Publisher } from '@newskit-render/api'
 
 const AccountEditField = (props) => (
   <DynamicPage
     objectMap={editComponentMap}
+    isPageRestricted={props.isPageRestricted}
     pageName={props.data.type}
     Component={EditField}
     componentProps={props}
@@ -27,19 +31,28 @@ export const getServerSideProps = async (context) => {
   } = context
   const doesEditPageExist = Object.keys(editComponentMap).includes(field)
 
+  const isBroadcasting = publisher === Publisher.BROADCASTING
+  const broadcastingOnlyPages = Object.keys(broadcastingOnlyEditComponentMap)
+
+  const isPageRestricted =
+    !isBroadcasting && broadcastingOnlyPages.includes(field)
+
   replaceConsoleAndSetTransactionName(`Account: edit ${field}`)
 
-  if (!doesEditPageExist) {
+  if (!doesEditPageExist || isPageRestricted) {
     context.res.statusCode = 404
     // Logging the error for being captured by New Relic
     console.error(`An error ${context.res.statusCode} occurred on server`)
   }
   /* start cra-effected */
-  const featureFlags = await getFlagsAll()
+  const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
 
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'EditField' },
-    { featureFlags } /* cra-effected */
+    {
+      featureFlags,
+      isPageRestricted,
+    } /* cra-effected */
   )
 }

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

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

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

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

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

@@ -1,7 +1,8 @@
 import React from 'react'
-import { getProviderProps, HolidayStopList } from '@newskit-render/my-account'
+import { HolidayStopList } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import { holidayStopListContextOverrides } from '../../../context/app-context/holidayStopListContextOverrides'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountUpcomingHolidayStops = (props) => (
   <HolidayStopList
@@ -15,5 +16,5 @@ export default AccountUpcomingHolidayStops
 
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Upcoming Holiday Stops')
-  return getProviderProps({ ...context, provider: 'HolidayStop' })
+  return getProviderPropsUtil({ ...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 { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
+import { PersonalDetails } 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'
-import { closeFlagsInstance } from '@newskit-render/feature-flags'
+import { getProviderPropsUtil } from '../../helpers/getProviderPropsUtil'
 
 const AccountPersonalDetails = (props) => {
   return (
@@ -23,10 +23,9 @@ export default AccountPersonalDetails
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Personal details')
 
-  const featureFlags = await getFlagsAll()
-  await closeFlagsInstance()
+  const featureFlags = await getAllFeatureFlags()
 
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'PersonalDetails' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/newsletters/index.tsx

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

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

@@ -1,10 +1,8 @@
 import React from 'react'
-import {
-  NewslettersAndAlerts,
-  getProviderProps,
-} from '@newskit-render/my-account'
+import { NewslettersAndAlerts } from '@newskit-render/my-account'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
-import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
+import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountNewslettersAndAlerts = (props) => (
   <NewslettersAndAlerts {...props} />
@@ -15,9 +13,9 @@ export default AccountNewslettersAndAlerts
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Newsletters and Alerts')
   /* start cra-effected */
-  const featureFlags = await getFlagsAll()
+  const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'NewslettersAndAlerts' },
     { featureFlags } /* cra-effected */
   )

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

@@ -1,12 +1,12 @@
 import React from 'react'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import {
-  getProviderProps,
   Payment,
   paymentMethodsMap,
   DynamicPage,
 } from '@newskit-render/my-account'
-import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
+import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const PaymentPage = (props) => {
   return (
@@ -24,10 +24,10 @@ export default PaymentPage
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Payment method')
   /* start cra-effected */
-  const featureFlags = await getFlagsAll()
+  const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
 
-  return getProviderProps(
+  return getProviderPropsUtil(
     {
       ...context,
       provider: 'Payment',

package/pages/account/payment/index.tsx

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

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

@@ -1,8 +1,9 @@
 import React from 'react'
-import { getProviderProps, PaymentMethods } from '@newskit-render/my-account'
-import { getFlagsAll } from '@newskit-render/feature-flags' // create-render-app effected
+import { 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'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountPaymentMethods = (props) => (
   <PaymentMethods {...props} context={paymentMethodContext} />
@@ -12,9 +13,9 @@ export default AccountPaymentMethods
 
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Payment Methods')
-  const featureFlags = await getFlagsAll()
+  const featureFlags = await getAllFeatureFlags()
   // create-render-app effected
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'PaymentMethods' },
     { featureFlags } // create-render-app effected
   )

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

@@ -1,23 +1,31 @@
 import React from 'react'
 import {
   SubscriptionAndBilling,
-  getProviderProps,
+  subscriptionAndBillingContextSun,
+  subscriptionAndBillingContext,
 } from '@newskit-render/my-account'
-import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
+import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
+import { Publisher } from '@newskit-render/api'
 
-const AccountSubscriptionAndBilling = (props) => (
-  <SubscriptionAndBilling {...props} />
-)
+const AccountSubscriptionAndBilling = (props) => {
+  const context =
+    props.env.PUBLISHER === Publisher.SUN_UK
+      ? subscriptionAndBillingContextSun
+      : subscriptionAndBillingContext
+
+  return <SubscriptionAndBilling {...props} context={context} />
+}
 
 export default AccountSubscriptionAndBilling
 
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Subscription and Billing')
   /* start cra-effected */
-  const featureFlags = await getFlagsAll()
+  const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  const result = await getProviderProps(
+  const result = await getProviderPropsUtil(
     {
       ...context,
       provider: 'SubscriptionAndBilling',

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

@@ -0,0 +1,20 @@
+import React from 'react'
+import { UserHub as UserHubPage } 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 UserHub = (props) => <UserHubPage {...props} />
+
+export default UserHub
+
+export const getServerSideProps = async (context) => {
+  replaceConsoleAndSetTransactionName('Account: UserHub')
+  /* start cra-effected */
+  const featureFlags = await getAllFeatureFlags()
+  /* end cra-effected */
+  return getProviderPropsUtil(
+    { ...context, provider: 'UserHub' },
+    { featureFlags } /* cra-effected */
+  )
+}

package/temp/_document.tsx

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import React from 'react'
 import Script from 'next/script'
 import Document, {

package/pages/account/family/index.tsx

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