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

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 { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const AccountNewslettersAndAlerts = (props) => <DreamTeam {...props} />
 
@@ -12,7 +13,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
+  return getProviderPropsUtil(
     { ...context, provider: 'DreamTeam' },
     { featureFlags } /* cra-effected */
   )

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

@@ -2,17 +2,20 @@ import React from 'react'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import {
   EditField,
-  // getProviderProps,
-  getProviderPropsTimes,
   editComponentMap,
+  broadcastingOnlyEditComponentMap,
   DynamicPage,
 } from '@newskit-render/my-account'
 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}
@@ -28,9 +31,15 @@ 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`)
@@ -39,8 +48,11 @@ export const getServerSideProps = async (context) => {
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
 
-  return getProviderPropsTimes(
+  return getProviderPropsUtil(
     { ...context, provider: 'EditField' },
-    { featureFlags } /* cra-effected */
+    {
+      featureFlags,
+      isPageRestricted,
+    } /* cra-effected */
   )
 }

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

@@ -1,11 +1,8 @@
 import React from 'react'
-import {
-  // getProviderProps,
-  getProviderPropsTimes,
-  HolidayStop,
-} from '@newskit-render/my-account'
+import { HolidayStop } 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 AccountHolidayStop = (props) => <HolidayStop {...props} />
 
@@ -16,7 +13,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderPropsTimes(
+  return getProviderPropsUtil(
     { ...context, provider: 'HolidayStop' },
     { featureFlags } /* cra-effected */
   )

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

@@ -1,11 +1,8 @@
 import React from 'react'
-import {
-  // getProviderProps,
-  getProviderPropsTimes,
-  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
@@ -19,5 +16,5 @@ export default AccountPreviousHolidayStops
 
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Previous Holiday Stops')
-  return getProviderPropsTimes({ ...context, provider: 'HolidayStop' })
+  return getProviderPropsUtil({ ...context, provider: 'HolidayStop' })
 }

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

@@ -1,11 +1,8 @@
 import React from 'react'
-import {
-  // getProviderProps,
-  getProviderPropsTimes,
-  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
@@ -19,5 +16,5 @@ export default AccountUpcomingHolidayStops
 
 export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Upcoming Holiday Stops')
-  return getProviderPropsTimes({ ...context, provider: 'HolidayStop' })
+  return getProviderPropsUtil({ ...context, provider: 'HolidayStop' })
 }

package/pages/account/index.tsx

@@ -1,12 +1,9 @@
 import React from 'react'
-import {
-  PersonalDetails,
-  getProviderPropsTimes,
-  // getProviderProps,
-} from '@newskit-render/my-account'
+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 { getProviderPropsUtil } from '../../helpers/getProviderPropsUtil'
 
 const AccountPersonalDetails = (props) => {
   return (
@@ -28,7 +25,7 @@ export const getServerSideProps = async (context) => {
 
   const featureFlags = await getAllFeatureFlags()
 
-  return getProviderPropsTimes(
+  return getProviderPropsUtil(
     { ...context, provider: 'PersonalDetails' },
     { featureFlags } /* cra-effected */
   )

package/pages/account/newsletters/index.tsx

@@ -1,7 +1,8 @@
 import React from 'react'
-import { Newsletters, getProviderPropsTimes } from '@newskit-render/my-account'
+import { Newsletters } 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 AccountNewsletters = (props) => <Newsletters {...props} />
 
@@ -12,7 +13,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderPropsTimes(
+  return getProviderPropsUtil(
     { ...context, provider: 'Newsletters' },
     { featureFlags } /* cra-effected */
   )

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

@@ -1,11 +1,8 @@
 import React from 'react'
-import {
-  NewslettersAndAlerts,
-  getProviderPropsTimes,
-  // getProviderProps
-} from '@newskit-render/my-account'
+import { NewslettersAndAlerts } 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 AccountNewslettersAndAlerts = (props) => (
   <NewslettersAndAlerts {...props} />
@@ -18,7 +15,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderPropsTimes(
+  return getProviderPropsUtil(
     { ...context, provider: 'NewslettersAndAlerts' },
     { featureFlags } /* cra-effected */
   )

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

@@ -1,13 +1,12 @@
 import React from 'react'
 import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
 import {
-  // getProviderProps,
-  getProviderPropsTimes,
   Payment,
   paymentMethodsMap,
   DynamicPage,
 } from '@newskit-render/my-account'
 import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
+import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
 
 const PaymentPage = (props) => {
   return (
@@ -28,7 +27,7 @@ export const getServerSideProps = async (context) => {
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
 
-  return getProviderPropsTimes(
+  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 { 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} />
 
@@ -13,7 +14,7 @@ export const getServerSideProps = async (context) => {
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
 
-  return getProviderProps(
+  return getProviderPropsUtil(
     {
       ...context,
       provider: 'Payment',

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

@@ -1,12 +1,9 @@
 import React from 'react'
-import {
-  // getProviderProps,
-  getProviderPropsTimes,
-  PaymentMethods,
-} from '@newskit-render/my-account'
+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} />
@@ -18,7 +15,7 @@ export const getServerSideProps = async (context) => {
   replaceConsoleAndSetTransactionName('Account: Payment Methods')
   const featureFlags = await getAllFeatureFlags()
   // create-render-app effected
-  return getProviderPropsTimes(
+  return getProviderPropsUtil(
     { ...context, provider: 'PaymentMethods' },
     { featureFlags } // create-render-app effected
   )

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

@@ -1,15 +1,22 @@
 import React from 'react'
 import {
   SubscriptionAndBilling,
-  getProviderPropsTimes,
-  // getProviderProps,
+  subscriptionAndBillingContextSun,
+  subscriptionAndBillingContext,
 } from '@newskit-render/my-account'
 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
 
@@ -18,7 +25,7 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  const result = await getProviderPropsTimes(
+  const result = await getProviderPropsUtil(
     {
       ...context,
       provider: 'SubscriptionAndBilling',

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

@@ -1,10 +1,8 @@
 import React from 'react'
-import {
-  UserHub as UserHubPage,
-  getProviderProps,
-} from '@newskit-render/my-account'
+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} />
 
@@ -15,8 +13,8 @@ export const getServerSideProps = async (context) => {
   /* start cra-effected */
   const featureFlags = await getAllFeatureFlags()
   /* end cra-effected */
-  return getProviderProps(
-    { ...context, provider: 'PersonalDetails' },
+  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, {