@newskit-render/core 2.16.0 → 2.17.1

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.17.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@2.17.1-alpha.0...@newskit-render/core@2.17.1) (2022-11-10)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
+# [2.17.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@2.17.0-alpha.1...@newskit-render/core@2.17.0) (2022-11-10)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
 # [2.16.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@2.16.0-alpha.0...@newskit-render/core@2.16.0) (2022-11-09)
 
 **Note:** Version bump only for package @newskit-render/core

package/README.md

@@ -271,4 +271,4 @@ code here
 
 This comment is to denote that the line or lines in between are effected by the running of the [@newskit-render/create-render-app package](https://github.com/newscorp-ghfb/ncu-newskit-render/tree/master/packages/create-render-app).
 
-If you our touching / modifiying code with these comments you need to be aware that you may affect the successful running of the [@newskit-render/create-render-app package](https://github.com/newscorp-ghfb/ncu-newskit-render/tree/master/packages/create-render-app).
+If you our touching / modifiying code with these comments you need to be aware that you may affect the successful running of the [@newskit-render/create-render-app package](https://github.com/newscorp-ghfb/ncu-newskit-render/tree/master/packages/create-render-app)

package/cypress/e2e/account/holiday-stop.spec.js

@@ -3,7 +3,7 @@ import * as userHolidayStops from '../../fixtures/holiday-stops.json'
 describe('Book a holiday stop', () => {
   beforeEach(() => {
     cy.GetAcsSession()
-    cy.mockConsentAndVisit('/account/holiday-stop/book')
+    cy.mockConsentAndVisit('/account/holiday-stop')
   })
 
   it('should display book a holiday stop page', () => {
@@ -26,7 +26,7 @@ describe('Upcoming holiday stops', () => {
 
   it('should navigate to the Upcoming holiday stops and display the list of upcoming holiday stops', () => {
     cy.visitAndOverrideNextData(
-      '/account/holiday-stop/book',
+      '/account/holiday-stop',
       'props.pageProps.user.holidayStops',
       userHolidayStops.holidayStops
     )
@@ -45,11 +45,11 @@ describe('Upcoming holiday stops', () => {
   })
 })
 
-describe('Cancel holiday stop', () => {
+describe.skip('Cancel holiday stop', () => {
   beforeEach(() => {
     cy.mockConsent()
     cy.visitAndOverrideNextData(
-      '/account/holiday-stop/book',
+      '/account/holiday-stop',
       'props.pageProps.user.holidayStops',
       userHolidayStops.holidayStops
     )
@@ -71,3 +71,77 @@ describe('Cancel holiday stop', () => {
     )
   })
 })
+
+describe('Add a Holiday Stop', () => {
+  beforeEach(() => {
+    cy.GetAcsSession()
+    cy.mockConsentAndVisit('/account/add/holiday-stop')
+  })
+  it('should display add holiday stop page', () => {
+    cy.get('[data-testid="introduction-title"]').contains('Add a Holiday Stop')
+    cy.get('[data-testid="create-holiday-stop"]').should('exist')
+    cy.get('[data-testid="description-block"]').contains('Choose Your Dates')
+    cy.get('[id="startDate"]').should('exist')
+    cy.get('[id="endDate"]').should('exist')
+    cy.get('[data-testid="primary-button"]').should('exist')
+    cy.get('[data-testid="secondary-button"]')
+      .should('have.attr', 'href', '/account/holiday-stop')
+      .contains('Cancel')
+  })
+  it('should able to select startDate and endDate', () => {
+    const dateFormatOptions = {
+      year: 'numeric',
+      month: 'numeric',
+      day: 'numeric',
+    }
+    cy.get('[id="startDate"]').should('be.visible').click({ force: true })
+
+    cy.get('input[name="startDate"]').type(
+      new Date('10/18/2022').toLocaleDateString('en-GB', dateFormatOptions)
+    )
+    cy.get('input[name="endDate"]').type(
+      new Date('10/20/2022').toLocaleDateString('en-GB', dateFormatOptions)
+    )
+
+    cy.intercept('POST', '/api/account/mutate', {
+      statusCode: 200,
+      body: { data: { createUserHolidayStop: { success: true } } },
+    })
+    cy.get('[data-testid="primary-button"]')
+      .should('be.visible')
+      .click({ force: true })
+    cy.get('[data-testid="modal"]').should('exist')
+    cy.get('[data-testid="introduction-title"]').contains('Holiday Stop added')
+    cy.get('[data-testid="description-block"]').contains(
+      'You have successfully added a Holiday Stop to your account. Your account will be credited no more than 8 weeks after the holiday start date.'
+    )
+    cy.get('[aria-label="Retun to Holiday Stops"]').click()
+  })
+})
+
+describe('Edit Holiday Stops', () => {
+  beforeEach(() => {
+    cy.GetAcsSession()
+    cy.visitAndOverrideNextData(
+      '/account/edit/holiday-stop?id=a2U7Y000001r8aSUAQ',
+      'props.pageProps.data.fields',
+      [
+        {
+          value: [
+            {
+              id: 'a2U7Y000001r8aSUAQ',
+              startDate: '2022-10-12T00:00:00',
+              endDate: '2022-10-13T00:00:00',
+            },
+          ],
+        },
+      ]
+    )
+  })
+  it('should display edit holiday stop page', () => {
+    cy.get('[data-testid="introduction-title"]').contains('Edit a Holiday Stop')
+    cy.get('[data-testid="update-holiday-stop"]').should('exist')
+    cy.get('[name="startDate"]').invoke('val').should('equal', '12/10/2022')
+    cy.get('[name="endDate"]').invoke('val').should('equal', '13/10/2022')
+  })
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "2.16.0",
+  "version": "2.17.1",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -40,13 +40,13 @@
     "@emotion/styled": "11.10.4",
     "@newskit-render/api": "^1.2.1",
     "@newskit-render/auth": "^1.1.1",
-    "@newskit-render/checkout": "^1.5.3",
+    "@newskit-render/checkout": "^1.5.4",
     "@newskit-render/feature-flags": "^1.2.0",
     "@newskit-render/feed": "^1.2.0",
-    "@newskit-render/my-account": "^3.13.0",
-    "@newskit-render/shared-components": "^1.12.0",
-    "@newskit-render/standalone-components": "^1.9.1",
-    "@newskit-render/validation": "^1.3.0",
+    "@newskit-render/my-account": "^3.13.1",
+    "@newskit-render/shared-components": "^1.12.1",
+    "@newskit-render/standalone-components": "^1.9.2",
+    "@newskit-render/validation": "^1.3.1",
     "cross-fetch": "3.1.5",
     "graphql": "15.6.0",
     "lodash.get": "4.4.2",
@@ -116,7 +116,8 @@
   "resolutions": {
     "@types/react": "18.0.19",
     "@types/react-dom": "18.0.6",
-    "@types/pino-std-serializers": "2.4.1"
+    "@types/pino-std-serializers": "2.4.1",
+    "@types/pino-pretty": "4.7.5"
   },
   "overrides": {
     "@types/react": "18.0.19",

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

@@ -0,0 +1,45 @@
+import React, { useContext } from 'react'
+import newrelic from 'newrelic'
+import { AddField, NotFound, addComponentMap } from '@newskit-render/my-account'
+import validation from '../../../validation'
+import { AppContext } from '../../../context/app-context'
+import { createThemeDropdownObject } from '../../../helpers/createThemeDropdownObject'
+
+const AccountAddField = (props) => {
+  const doesAddPageExist = Object.keys(addComponentMap).includes(
+    props.data.type
+  )
+  const { theme, setTheme } = useContext(AppContext)
+  const themeDropdownObject = createThemeDropdownObject(setTheme)
+
+  if (doesAddPageExist) {
+    return (
+      <AddField
+        {...props}
+        validation={validation}
+        customTheme={theme}
+        themeDropdownObject={themeDropdownObject}
+      />
+    )
+  }
+  return <NotFound />
+}
+
+export default AccountAddField
+export const getServerSideProps = async (context) => {
+  const {
+    params: { field },
+  } = context
+  const doesAddpageExist = Object.keys(addComponentMap).includes(field)
+
+  newrelic.setTransactionName(`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 } },
+  }
+}

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

@@ -4,7 +4,7 @@ import {
   EditField,
   getProviderProps,
   NotFound,
-  componentMap,
+  editComponentMap,
 } from '@newskit-render/my-account'
 import { initAndGetFeatureFlag } from '@newskit-render/feature-flags' // create-render-app effected
 import { optimizelysdkKey } from '../../../config' // create-render-app effected
@@ -13,7 +13,9 @@ import { AppContext } from '../../../context/app-context'
 import { createThemeDropdownObject } from '../../../helpers/createThemeDropdownObject'
 
 const AccountEditField = (props) => {
-  const doesEditPageExist = Object.keys(componentMap).includes(props.data.type)
+  const doesEditPageExist = Object.keys(editComponentMap).includes(
+    props.data.type
+  )
   const { theme, setTheme } = useContext(AppContext)
   const themeDropdownObject = createThemeDropdownObject(setTheme)
 
@@ -36,7 +38,7 @@ export const getServerSideProps = async (context) => {
   const {
     params: { field },
   } = context
-  const doesEditPageExist = Object.keys(componentMap).includes(field)
+  const doesEditPageExist = Object.keys(editComponentMap).includes(field)
 
   newrelic.setTransactionName(`Account: edit ${field}`)