@newskit-render/core 1.33.1 → 1.42.1

package/CHANGELOG.md

@@ -3,6 +3,156 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.42.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.42.0...@newskit-render/core@1.42.1) (2022-03-25)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [1.42.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.41.1...@newskit-render/core@1.42.0) (2022-03-24)
+
+
+### Features
+
+* **PPDSR-688:** update mock server data ([#649](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/649)) ([afe1b28](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/afe1b28adbf0184426e2eeb372aaf73bb1f37e02))
+
+
+
+
+
+## [1.41.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.41.0...@newskit-render/core@1.41.1) (2022-03-24)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [1.41.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.40.0...@newskit-render/core@1.41.0) (2022-03-23)
+
+
+### Features
+
+* **PPDSR-709:** Remove problematic snapshot tests ([#641](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/641)) ([2bd723a](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/2bd723a4e470904807e97820d923d6523cd4a953))
+
+
+
+
+
+# [1.40.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.39.0...@newskit-render/core@1.40.0) (2022-03-22)
+
+
+### Features
+
+* **PPDSR-728:** handle terminated subscriptions ([#644](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/644)) ([51a29dd](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/51a29dd0dc192c5c11e5d9dc92e22bb3b9723f73))
+
+
+
+
+
+# [1.39.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.38.0...@newskit-render/core@1.39.0) (2022-03-22)
+
+
+### Features
+
+* **PPDSR-742:** Update cancel/past due banners  ([#639](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/639)) ([2e16cf1](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/2e16cf16723d5e63bd73358a69c5bcc62fef3c2b))
+
+
+
+
+
+# [1.38.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.37.0...@newskit-render/core@1.38.0) (2022-03-22)
+
+
+### Features
+
+* **PPDSR-711:** 500 error page ([#637](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/637)) ([e64a478](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/e64a478104dd3873db3f27ced1ba57e1eb8fa441))
+
+
+
+
+
+# [1.37.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.36.1...@newskit-render/core@1.37.0) (2022-03-21)
+
+
+### Features
+
+* **PPDSR-708:** add payment failer e2e tests ([#640](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/640)) ([6b87055](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/6b87055f2c6748d9cc44e2130bd5aebf309d2428))
+
+
+
+
+
+## [1.36.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.36.0...@newskit-render/core@1.36.1) (2022-03-21)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [1.36.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.35.0...@newskit-render/core@1.36.0) (2022-03-18)
+
+
+### Features
+
+* **PPDSR-687:** update mock ([#632](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/632)) ([7a3d950](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/7a3d950f76c6faa7985192d1d04dfb8a92c8b23e))
+
+
+
+
+
+# [1.35.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.34.1...@newskit-render/core@1.35.0) (2022-03-17)
+
+
+### Features
+
+* **PPDSR-482:** Subscription / Cancellation E2E tests ([#634](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/634)) ([92e2867](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/92e2867f6f03277389896bcd877bd26e88cc7094))
+
+
+
+
+
+## [1.34.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.34.0...@newskit-render/core@1.34.1) (2022-03-17)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [1.34.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.33.3...@newskit-render/core@1.34.0) (2022-03-16)
+
+
+### Features
+
+* **PPDSR-702:** update-next-version ([#629](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/629)) ([74dccae](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/74dccaec9102dd334fdae91e2138a08d10148195))
+
+
+
+
+
+## [1.33.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.33.2...@newskit-render/core@1.33.3) (2022-03-15)
+
+
+### Bug Fixes
+
+* **PPDSR-719:** update subscription query property ([#631](https://github.com/newscorp-ghfb/ncu-newskit-render/issues/631)) ([09bb279](https://github.com/newscorp-ghfb/ncu-newskit-render/commit/09bb279cbcf4078c21a01457fd02716ce9e6c6bf))
+
+
+
+
+
+## [1.33.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.33.1...@newskit-render/core@1.33.2) (2022-03-14)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
 ## [1.33.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@1.33.0...@newskit-render/core@1.33.1) (2022-03-14)
 
 **Note:** Version bump only for package @newskit-render/core

package/__tests__/pages/__snapshots__/home.test.tsx.snap

@@ -1664,7 +1664,7 @@ exports[`getServerSideProps Homepage 1`] = `
   }
 }
 
-.emotion-110 {
+.emotion-109 {
   border-style: solid;
   border-color: #DEDEDE;
   border-width: 1px;
@@ -1676,7 +1676,7 @@ exports[`getServerSideProps Homepage 1`] = `
   border-color: transparent;
 }
 
-.emotion-112 {
+.emotion-111 {
   display: inline-block;
   transition-property: color;
   transition-duration: 200ms;
@@ -1686,31 +1686,31 @@ exports[`getServerSideProps Homepage 1`] = `
   text-decoration: none;
 }
 
-.emotion-112 svg {
+.emotion-111 svg {
   fill: #3358CC;
 }
 
-.emotion-112:hover:not(:disabled) {
+.emotion-111:hover:not(:disabled) {
   color: #2B4AAB;
   -webkit-text-decoration: underline;
   text-decoration: underline;
 }
 
-.emotion-112:hover:not(:disabled) svg {
+.emotion-111:hover:not(:disabled) svg {
   fill: #2B4AAB;
 }
 
-.emotion-112:active:not(:disabled) {
+.emotion-111:active:not(:disabled) {
   color: #213A82;
   -webkit-text-decoration: underline;
   text-decoration: underline;
 }
 
-.emotion-112:active:not(:disabled) svg {
+.emotion-111:active:not(:disabled) svg {
   fill: #213A82;
 }
 
-.emotion-113 {
+.emotion-112 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -1729,7 +1729,7 @@ exports[`getServerSideProps Homepage 1`] = `
   justify-content: flex-start;
 }
 
-.emotion-134 {
+.emotion-133 {
   position: relative;
   width: 100%;
   display: block;
@@ -1740,11 +1740,11 @@ exports[`getServerSideProps Homepage 1`] = `
   background-color: #F4F4F4;
 }
 
-.emotion-134 svg {
+.emotion-133 svg {
   fill: #C0C0C0;
 }
 
-.emotion-165 {
+.emotion-164 {
   background:color: #F4F4F4;
 }
 
@@ -1770,7 +1770,7 @@ exports[`getServerSideProps Homepage 1`] = `
           >
             <div
               class="emotion-6"
-              data-testid="LEAD_1_AND_2-Grid"
+              data-testid="SUPPLEMENT_LEAD_AND_4_STACK-Grid"
             >
               <div
                 class="emotion-7"
@@ -1825,7 +1825,7 @@ exports[`getServerSideProps Homepage 1`] = `
                 >
                   <div
                     class="emotion-19"
-                    data-testid="LEAD_1_AND_2-InnerGrid"
+                    data-testid="SUPPLEMENT_LEAD_AND_4_STACK-InnerGrid"
                   >
                     <div
                       class="emotion-20"
@@ -2017,7 +2017,7 @@ exports[`getServerSideProps Homepage 1`] = `
                           <img
                             alt="image alt"
                             class="emotion-63"
-                            src="some-url-to-image"
+                            src="https://www.thesun.co.uk/wp-content/uploads/2022/03/SPORT-PREVIEW-Amadou-Onana-to-WHU.jpg?strip=all&w=620&h=413&crop=1"
                           />
                         </picture>
                       </div>
@@ -2073,7 +2073,7 @@ exports[`getServerSideProps Homepage 1`] = `
                           <img
                             alt="image alt 2"
                             class="emotion-63"
-                            src="some-url-to-image"
+                            src="https://www.thesun.co.uk/wp-content/uploads/2022/03/SPORT-PREVIEW-Amadou-Onana-to-WHU.jpg?strip=all&w=620&h=413&crop=1"
                           />
                         </picture>
                       </div>
@@ -2121,15 +2121,12 @@ exports[`getServerSideProps Homepage 1`] = `
                         class="emotion-22"
                       >
                         <picture
-                          class="emotion-61"
+                          class="emotion-10"
                         >
-                          <div
-                            class="emotion-62"
-                          />
                           <img
-                            alt="image alt 3"
-                            class="emotion-63"
-                            src="some-url-to-image"
+                            alt=""
+                            class="emotion-11"
+                            src=""
                           />
                         </picture>
                       </div>
@@ -2185,7 +2182,7 @@ exports[`getServerSideProps Homepage 1`] = `
                           <img
                             alt="image alt 3"
                             class="emotion-63"
-                            src="some-url-to-image"
+                            src="https://www.thesun.co.uk/wp-content/uploads/2022/03/SPORT-PREVIEW-Amadou-Onana-to-WHU.jpg?strip=all&w=620&h=413&crop=1"
                           />
                         </picture>
                       </div>
@@ -2227,7 +2224,7 @@ exports[`getServerSideProps Homepage 1`] = `
             </div>
             <hr
               aria-hidden="true"
-              class="emotion-110"
+              class="emotion-109"
               data-testid="divider"
             />
           </div>
@@ -2242,11 +2239,11 @@ exports[`getServerSideProps Homepage 1`] = `
             </h2>
             <p>
               <a
-                class="emotion-112"
+                class="emotion-111"
                 href="/catagory-one/demo-1/test-headline"
               >
                 <span
-                  class="emotion-113"
+                  class="emotion-112"
                 >
                   <span
                     class="emotion-51"
@@ -2258,11 +2255,11 @@ exports[`getServerSideProps Homepage 1`] = `
             </p>
             <p>
               <a
-                class="emotion-112"
+                class="emotion-111"
                 href="/catagory-two/demo-2/test-headline-2"
               >
                 <span
-                  class="emotion-113"
+                  class="emotion-112"
                 >
                   <span
                     class="emotion-51"
@@ -2284,11 +2281,11 @@ exports[`getServerSideProps Homepage 1`] = `
             </h2>
             <p>
               <a
-                class="emotion-112"
+                class="emotion-111"
                 href="/uncategorized"
               >
                 <span
-                  class="emotion-113"
+                  class="emotion-112"
                 >
                   <span
                     class="emotion-51"
@@ -2300,11 +2297,11 @@ exports[`getServerSideProps Homepage 1`] = `
             </p>
             <p>
               <a
-                class="emotion-112"
+                class="emotion-111"
                 href="/uncategorized"
               >
                 <span
-                  class="emotion-113"
+                  class="emotion-112"
                 >
                   <span
                     class="emotion-51"
@@ -2316,11 +2313,11 @@ exports[`getServerSideProps Homepage 1`] = `
             </p>
             <p>
               <a
-                class="emotion-112"
+                class="emotion-111"
                 href="/uncategorized"
               >
                 <span
-                  class="emotion-113"
+                  class="emotion-112"
                 >
                   <span
                     class="emotion-51"
@@ -2339,7 +2336,7 @@ exports[`getServerSideProps Homepage 1`] = `
           >
             <div
               class="emotion-6"
-              data-testid="LEAD_1_AND_2-Grid"
+              data-testid="SUPPLEMENT_LEAD_AND_4_STACK-Grid"
             >
               <div
                 class="emotion-7"
@@ -2352,7 +2349,7 @@ exports[`getServerSideProps Homepage 1`] = `
                     class="emotion-9"
                   >
                     <picture
-                      class="emotion-134"
+                      class="emotion-133"
                     >
                       <div
                         class="emotion-62"
@@ -2391,7 +2388,7 @@ exports[`getServerSideProps Homepage 1`] = `
                 >
                   <div
                     class="emotion-19"
-                    data-testid="LEAD_1_AND_2-InnerGrid"
+                    data-testid="SUPPLEMENT_LEAD_AND_4_STACK-InnerGrid"
                   >
                     <div
                       class="emotion-20"
@@ -2404,7 +2401,7 @@ exports[`getServerSideProps Homepage 1`] = `
                           class="emotion-22"
                         >
                           <picture
-                            class="emotion-134"
+                            class="emotion-133"
                           >
                             <div
                               class="emotion-62"
@@ -2445,7 +2442,7 @@ exports[`getServerSideProps Homepage 1`] = `
                           class="emotion-22"
                         >
                           <picture
-                            class="emotion-134"
+                            class="emotion-133"
                           >
                             <div
                               class="emotion-62"
@@ -2484,7 +2481,7 @@ exports[`getServerSideProps Homepage 1`] = `
             class="emotion-4"
           />
           <div
-            class="emotion-165"
+            class="emotion-164"
           >
             <div
               class="emotion-42"
@@ -2577,7 +2574,7 @@ exports[`getServerSideProps Homepage 1`] = `
                           <img
                             alt="image alt"
                             class="emotion-63"
-                            src="some-url-to-image"
+                            src="https://www.thesun.co.uk/wp-content/uploads/2022/03/SPORT-PREVIEW-Amadou-Onana-to-WHU.jpg?strip=all&w=620&h=413&crop=1"
                           />
                         </picture>
                       </div>
@@ -2633,7 +2630,7 @@ exports[`getServerSideProps Homepage 1`] = `
                           <img
                             alt="image alt 2"
                             class="emotion-63"
-                            src="some-url-to-image"
+                            src="https://www.thesun.co.uk/wp-content/uploads/2022/03/SPORT-PREVIEW-Amadou-Onana-to-WHU.jpg?strip=all&w=620&h=413&crop=1"
                           />
                         </picture>
                       </div>
@@ -2689,7 +2686,7 @@ exports[`getServerSideProps Homepage 1`] = `
                           <img
                             alt="image alt 3"
                             class="emotion-63"
-                            src="some-url-to-image"
+                            src="https://www.thesun.co.uk/wp-content/uploads/2022/03/SPORT-PREVIEW-Amadou-Onana-to-WHU.jpg?strip=all&w=620&h=413&crop=1"
                           />
                         </picture>
                       </div>
@@ -2745,7 +2742,7 @@ exports[`getServerSideProps Homepage 1`] = `
                           <img
                             alt="image alt 3"
                             class="emotion-63"
-                            src="some-url-to-image"
+                            src="https://www.thesun.co.uk/wp-content/uploads/2022/03/SPORT-PREVIEW-Amadou-Onana-to-WHU.jpg?strip=all&w=620&h=413&crop=1"
                           />
                         </picture>
                       </div>
@@ -2787,7 +2784,7 @@ exports[`getServerSideProps Homepage 1`] = `
             </div>
             <hr
               aria-hidden="true"
-              class="emotion-110"
+              class="emotion-109"
               data-testid="divider"
             />
           </div>

package/app-context/AppContext.test.tsx

@@ -9,18 +9,6 @@ const container = document.createElement('div')
 document.body.appendChild(container)
 
 describe('AppContext tests', () => {
-  test('renders the content without error', () => {
-    render(
-      <AppContextProvider>
-        <div>Test</div>
-      </AppContextProvider>,
-      container
-    )
-
-    expect(container.textContent).toBe('Test')
-    expect(container.innerHTML).toMatchSnapshot()
-  })
-
   test('renders the content with the default theme', () => {
     render(
       <AppContextProvider>

package/components/{404/404.tsx → ErrorPage/ErrorPage.tsx}

@@ -60,10 +60,15 @@ const gridOverride = {
   xsColumnGutter: 'space000',
 }
 
-const FourOhFour = () => (
+type ErrorPageProps = {
+  title: string
+  errorMassage: string
+}
+
+const ErrorPage = ({ title, errorMassage }: ErrorPageProps) => (
   <>
     <Head>
-      <title>Page not found</title>
+      <title>{title}</title>
     </Head>
     <Layout backgroundColor="white" gridOverride={gridOverride}>
       <Cell xs={10} xsOffset={1} md={12} mdOffset={0}>
@@ -84,7 +89,7 @@ const FourOhFour = () => (
               }}
               stylePreset="inkContrast"
             >
-              Page not found
+              {title}
             </TextBlock>
           </Block>
 
@@ -97,8 +102,7 @@ const FourOhFour = () => (
               stylePreset="inkBase"
               style={{ whiteSpace: 'pre-line' }}
             >
-              We can't seem to find what you're looking for. If you typed a URL
-              into your browser, it might be worth checking and trying again.
+              {errorMassage}
             </TextBlock>
           </Block>
           <Block
@@ -126,4 +130,4 @@ const FourOhFour = () => (
   </>
 )
 
-export default FourOhFour
+export default ErrorPage

package/components/article/__tests__/index.test.tsx

@@ -59,7 +59,7 @@ const articleData: ArticleProps = {
     ],
   },
   media: {
-    crop: { url: 'img//url', alt: 'testIMG', aspectRatio: '1:1' },
+    crops: [{ url: 'img//url', alt: 'testIMG', aspectRatio: '1:1' }],
   },
   highlights: [
     {
@@ -189,7 +189,7 @@ describe('Article', () => {
     const { getByAltText } = renderWithTheme(Article, articleData)
     const img = getByAltText('testIMG')
     const articleImage = articleData?.media as Image
-    expect(img.getAttribute('src')).toBe(articleImage.crop.url)
+    expect(img.getAttribute('src')).toBe(articleImage.crops[0].url)
   })
 
   test('should not render image', () => {

package/components/article/index.tsx

@@ -129,7 +129,9 @@ const ArticlePage: React.FC<ArticleProps> = ({
       gscId={gscId}
       fbType="article"
       fbImageUrl={
-        (media && 'crop' in media && media.crop ? media.crop.url : '') as string
+        (media && 'crops' in media && media.crops[0]
+          ? media.crops[0].url
+          : '') as string
       }
       twUsername={twitterUsername}
     />
@@ -226,7 +228,7 @@ const ArticlePage: React.FC<ArticleProps> = ({
           </Visible>
         </Block>
 
-        {media && 'crop' in media && (
+        {media && 'crops' in media && (
           <>
             <Block
               spaceStack={{
@@ -235,7 +237,7 @@ const ArticlePage: React.FC<ArticleProps> = ({
               }}
             >
               <StyledFigure>
-                <Image src={media.crop.url} alt={media.crop.alt} />
+                <Image src={media.crops[0].url} alt={media.crops[0].alt} />
               </StyledFigure>
             </Block>
           </>

package/components/header/index.tsx

@@ -72,19 +72,23 @@ const pastDueBanner = {
   },
   terminated: {
     title: 'Your subscription has been terminated',
+    phoneNumber: 'XXXX-XXX-XXXX',
     text:
-      'We didn’t receive payment for your subscription. To reactivate it, please call 0800 018 5177.',
+      'We didn’t receive payment for your subscription. To reactivate it, please call ##PHONE_NUMBER##.',
+    dismissDays: 7,
   },
   cancelled: {
     title: 'Your subscription has been cancelled.',
+    phoneNumber: 'XXXX-XXX-XXXX',
     text:
-      'You’ll no longer have access to subscription benefits. To re-activate call 0800 555 1234.',
+      'You’ll no longer have access to subscription benefits. To re-activate call ##PHONE_NUMBER##.',
+    dismissDays: 7,
   },
   toBeCancelled: {
     title: 'Your subscription will end soon.',
-    phoneNumber: '0800 555 1234',
+    phoneNumber: 'XXXX-XXX-XXXX',
     text:
-      'You have cacelled your subscription and will lose access to all benefits on ##DATE##. To re-activate your subcsription call ##PHONE_NUMBER##.',
+      'You have cancelled your subscription and will lose access to all benefits on ##DATE##. To re-activate your subscription call ##PHONE_NUMBER##.',
   },
   treshold: {
     firstNotice: 26,

package/components/section/ArticleSlice.tsx

@@ -11,7 +11,7 @@ const sliceBlockBuilder = (slice: Slice, collection: CollectionBlock) => {
   const sectionURL = collection?.link?.url || '/uncategorized'
   /* add layout to case statments when ready */
   const sliceTypes = {
-    LEAD_1_AND_2: <Lead slice={slice} />,
+    SUPPLEMENT_LEAD_AND_4_STACK: <Lead slice={slice} />,
     SECONDARY_4: (
       <SectionContext.Consumer>
         {({ isIndexPage }) => (