@newskit-render/core 1.29.4 → 1.30.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.30.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.29.5...@newskit-render/core@1.30.0) (2022-03-07)
+
+
+### Features
+
+* **PPDSR-627:** update-account-cancellation ([#593](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/593)) ([9b70d1c](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/9b70d1c8c670541b3d084073f372274951006ade))
+
+
+
+
+
+## [1.29.5](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.29.4...@newskit-render/core@1.29.5) (2022-03-03)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
 ## [1.29.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.29.3...@newskit-render/core@1.29.4) (2022-03-02)
 
 

package/__tests__/pages/[articleSlug].test.tsx

@@ -5,7 +5,7 @@ import Article, {
 } from '../../pages/[section]/[articleId]/[articleSlug]'
 import { renderWithQuery } from '../../helpers/test-utils'
 import { getUniversalArticleMock } from '../../helpers/mocks'
-import { URL, Slug, UserData } from '../../helpers/global-types'
+import { URL, Slug } from '../../helpers/global-types'
 
 const props: ArticleSlug = {
   universalArticle: {
@@ -59,20 +59,7 @@ const props: ArticleSlug = {
   gscId: '4320982',
 }
 
-const userMock = {
-  vxInstances: [
-    {
-      interactions: [
-        {
-          pastDue: {
-            isPastDue: false,
-            since: new Date(),
-          },
-        },
-      ],
-    },
-  ],
-} as UserData
+const userMock = {}
 
 jest.mock('cross-fetch', () =>
   jest.fn().mockImplementation(() =>

package/components/article/index.tsx

@@ -14,6 +14,7 @@ import {
   Divider,
 } from 'newskit'
 import { SEOComponent } from '@newskit-render/shared-components'
+import { UserData } from '@newskit-render/my-account'
 import MetaBoxComponent from './MetaBox'
 import Ad from '../ad'
 import Highlights from './Highlights'
@@ -27,7 +28,6 @@ import {
   Topic,
   Byline,
   ParagraphBlock,
-  UserData,
 } from '../../helpers/global-types'
 import ShareButton from '../common/ShareButton'
 import Layout from '../layout'

package/components/header/index.tsx

@@ -12,7 +12,7 @@ import {
   IconFilledMenu,
   Image,
 } from 'newskit'
-import { PastDueBannerExternal } from '@newskit-render/my-account'
+import { PastDueBannerExternal, UserData } from '@newskit-render/my-account'
 import {
   NextLink,
   theSunTheme,
@@ -30,7 +30,6 @@ import NewsKitLogoShort from '../common/NewskitLogoShort'
 import NavLink from '../common/NavLink'
 import { AppContext } from '../../app-context/AppContext'
 import { handleEnterKeyPress } from '../../helpers/a11y'
-import { UserData, VxInstance } from '../../helpers/global-types'
 
 export const headerSize = 'sizing090'
 
@@ -80,6 +79,12 @@ const pastDueBanner = {
     text:
       'You’ll no longer have access to subscription benefits. To re-activate call 0800 555 1234.',
   },
+  toBeCancelled: {
+    title: 'Your subscription will end soon.',
+    phoneNumber: '0800 555 1234',
+    text:
+      'You have cacelled your subscription and will lose access to all benefits on ##DATE##. To re-activate your subcsription call ##PHONE_NUMBER##.',
+  },
   treshold: {
     firstNotice: 26,
     secondNotice: 30,
@@ -280,7 +285,7 @@ const Header: React.FC<{ user: UserData }> = ({ user }) => {
       </StyledHeader>
       <PastDueBannerExternal
         pastDueBanner={pastDueBanner}
-        vxInstances={user?.vxInstances as VxInstance[]}
+        user={user}
         wrapper={BannerContainer}
       />
     </>

package/components/layout/LayoutTemplate.tsx

@@ -1,10 +1,10 @@
 import React from 'react'
+import { UserData } from '@newskit-render/my-account'
 import Header from '../header'
 import Footer from '../footer'
 import { Gutter } from './Gutter'
 import { LayoutProps } from './layoutTypes'
 import { MainGrid } from './MainGrid'
-import { UserData } from '../../helpers/global-types'
 
 const LayoutTemplate: React.FC<LayoutProps> = ({
   children,

package/components/layout/layoutTypes.ts

@@ -1,6 +1,6 @@
 import React from 'react'
 import { GridProps } from 'newskit'
-import { UserData } from '../../helpers/global-types'
+import { UserData } from '@newskit-render/my-account'
 
 export type LayoutProps = {
   children: React.ReactNode

package/components/section/index.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { Cell } from 'newskit'
-
-import { Page, UserData } from '../../helpers/global-types'
+import { UserData } from '@newskit-render/my-account'
+import { Page } from '../../helpers/global-types'
 import Layout from '../layout'
 import pageBlock from './pageBlock'
 import SectionTitleBar from '../common/SectionTitleBar'

package/helpers/getUser.ts

@@ -1,5 +1,5 @@
 import fetch from 'cross-fetch'
-import { UserData } from './global-types'
+import { UserData } from '@newskit-render/my-account'
 
 interface UserHeaders {
   [key: string]: string

package/helpers/global-types.ts

@@ -3,35 +3,6 @@ export enum ContentType {
   post,
 }
 
-export interface UserData {
-  firstName?: string
-  lastName?: string
-  cpn?: string
-  email?: string
-  hash?: string
-  customData?: string
-  displayName?: string
-  vxInstances?: VxInstance[]
-}
-
-export interface VxInstance {
-  spec?: {
-    description: string
-    id: string
-    isActive: string
-    name: string
-  }
-  interactions: [SubscriptionPaymentInstance]
-}
-
-export interface PastDue {
-  isPastDue: boolean
-  since: Date
-}
-export interface SubscriptionPaymentInstance {
-  pastDue: PastDue
-}
-
 export type RadioPost = {
   id: number
   type: ContentType

package/infrastructure/.circleci/config.yml

@@ -240,7 +240,6 @@ orbs:
                 echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.NEW_RELIC_LICENSE_KEY=${NEW_RELIC_LICENSE_KEY}"' >> $BASH_ENV
                 echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.MAIN_GRAPHQL_URL=${MAIN_GRAPHQL_URL}"' >> $BASH_ENV
                 echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.MAIN_COOKIE_NAME=${MAIN_COOKIE_NAME}"' >> $BASH_ENV
-                echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.MAIN_USER_ID=${MAIN_USER_ID}"' >> $BASH_ENV
                 echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.MAIN_AUDIENCE=${MAIN_AUDIENCE}"' >> $BASH_ENV
                 echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.MAIN_OAUTH_TOKEN=${MAIN_OAUTH_TOKEN}"' >> $BASH_ENV
                 echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.MAIN_CLIENT_ID=${MAIN_CLIENT_ID}"' >> $BASH_ENV

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "1.29.4",
+  "version": "1.30.0",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -37,10 +37,10 @@
     "@newskit-render/auth": "^0.29.0",
     "@newskit-render/checkout": "^0.24.2",
     "@newskit-render/feature-flags": "^0.11.0",
-    "@newskit-render/my-account": "^0.142.3",
+    "@newskit-render/my-account": "^0.143.0",
     "@newskit-render/shared-components": "^0.37.2",
     "@newskit-render/sitemap": "^0.35.0",
-    "@newskit-render/validation": "^0.36.0",
+    "@newskit-render/validation": "^0.37.0",
     "cross-fetch": "3.1.5",
     "graphql": "15.6.0",
     "newrelic": "7.1.0",

package/pages/[section]/[articleId]/[articleSlug].tsx

@@ -1,10 +1,10 @@
 import React from 'react'
 import newrelic from 'newrelic'
 import { createApolloClient, ClientTypes } from '@newskit-render/api'
+import { UserData } from '@newskit-render/my-account'
 import { GET_UNIVERSAL_ARTICLE } from '../../../queries'
 import ArticlePage, { UniversalArticle } from '../../../components/article'
 import { highlights, relatedArticles } from '../../../helpers/mocks/articleMock'
-import { UserData } from '../../../helpers/global-types'
 // import { fetchUser } from '../../../helpers/getUser'
 // import { ACCOUNT_QUERY_URL } from '../../../constants'
 import { addCacheHeaders } from '../../../helpers/addCacheHeaders'