@newskit-render/core 0.0.0-c58b97af → 0.0.0-caeaa514b
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +160 -0
- package/cypress/e2e/account/personal-details.cy.js +16 -2
- package/cypress/e2e/account/subscription-and-billing.cy.js +4 -3
- package/cypress/support/users.js +7 -7
- package/package.json +6 -6
- package/pages/account/add/[field].tsx +57 -5
- package/pages/account/cancellation/index.tsx +2 -2
- package/pages/account/dream-team/index.tsx +2 -2
- package/pages/account/edit/[field].tsx +5 -4
- package/pages/account/family/index.tsx +4 -4
- package/pages/account/holiday-stop/index.tsx +8 -4
- package/pages/account/holiday-stop/previous-holiday-stops.tsx +6 -2
- package/pages/account/holiday-stop/upcoming-holiday-stops.tsx +6 -2
- package/pages/account/index.tsx +8 -4
- package/pages/account/newsletters/index.tsx +4 -4
- package/pages/account/newsletters-and-alerts/index.tsx +5 -4
- package/pages/account/payment/[paymentMethod].tsx +5 -4
- package/pages/account/payment/index.tsx +2 -2
- package/pages/account/payment-methods/index.tsx +8 -4
- package/pages/account/subscription-and-billing/index.tsx +5 -4
- package/pages/account/user-hub/index.tsx +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,166 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [4.32.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.32.1-alpha.1...@newskit-render/core@4.32.1) (2024-09-05)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
# [4.32.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.32.0-alpha.0...@newskit-render/core@4.32.0) (2024-09-04)
|
|
15
|
+
|
|
16
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
## [4.31.11](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.31.11-alpha.0...@newskit-render/core@4.31.11) (2024-09-03)
|
|
23
|
+
|
|
24
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
## [4.31.10](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.31.10-alpha.2...@newskit-render/core@4.31.10) (2024-09-03)
|
|
31
|
+
|
|
32
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
## [4.31.9](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.31.9-alpha.0...@newskit-render/core@4.31.9) (2024-08-22)
|
|
39
|
+
|
|
40
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
## [4.31.8](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.31.8-alpha.0...@newskit-render/core@4.31.8) (2024-08-21)
|
|
47
|
+
|
|
48
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
49
|
+
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
|
|
53
|
+
|
|
54
|
+
## [4.31.7](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.31.7-alpha.0...@newskit-render/core@4.31.7) (2024-08-20)
|
|
55
|
+
|
|
56
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
57
|
+
|
|
58
|
+
|
|
59
|
+
|
|
60
|
+
|
|
61
|
+
|
|
62
|
+
## [4.31.6](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.31.6-alpha.0...@newskit-render/core@4.31.6) (2024-08-19)
|
|
63
|
+
|
|
64
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
65
|
+
|
|
66
|
+
|
|
67
|
+
|
|
68
|
+
|
|
69
|
+
|
|
70
|
+
## [4.31.5](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.31.5-alpha.1...@newskit-render/core@4.31.5) (2024-08-16)
|
|
71
|
+
|
|
72
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
73
|
+
|
|
74
|
+
|
|
75
|
+
|
|
76
|
+
|
|
77
|
+
|
|
78
|
+
## [4.31.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.31.4-alpha.0...@newskit-render/core@4.31.4) (2024-08-14)
|
|
79
|
+
|
|
80
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
81
|
+
|
|
82
|
+
|
|
83
|
+
|
|
84
|
+
|
|
85
|
+
|
|
86
|
+
## [4.31.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.31.3-alpha.0...@newskit-render/core@4.31.3) (2024-08-14)
|
|
87
|
+
|
|
88
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
89
|
+
|
|
90
|
+
|
|
91
|
+
|
|
92
|
+
|
|
93
|
+
|
|
94
|
+
## [4.31.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.31.2-alpha.0...@newskit-render/core@4.31.2) (2024-08-14)
|
|
95
|
+
|
|
96
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
97
|
+
|
|
98
|
+
|
|
99
|
+
|
|
100
|
+
|
|
101
|
+
|
|
102
|
+
## [4.31.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.31.1-alpha.0...@newskit-render/core@4.31.1) (2024-08-13)
|
|
103
|
+
|
|
104
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
105
|
+
|
|
106
|
+
|
|
107
|
+
|
|
108
|
+
|
|
109
|
+
|
|
110
|
+
# [4.31.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.31.0-alpha.0...@newskit-render/core@4.31.0) (2024-08-12)
|
|
111
|
+
|
|
112
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
113
|
+
|
|
114
|
+
|
|
115
|
+
|
|
116
|
+
|
|
117
|
+
|
|
118
|
+
## [4.30.8](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.30.8-alpha.0...@newskit-render/core@4.30.8) (2024-08-08)
|
|
119
|
+
|
|
120
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
121
|
+
|
|
122
|
+
|
|
123
|
+
|
|
124
|
+
|
|
125
|
+
|
|
126
|
+
## [4.30.7](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.30.7-alpha.0...@newskit-render/core@4.30.7) (2024-08-07)
|
|
127
|
+
|
|
128
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
129
|
+
|
|
130
|
+
|
|
131
|
+
|
|
132
|
+
|
|
133
|
+
|
|
134
|
+
## [4.30.6](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.30.6-alpha.0...@newskit-render/core@4.30.6) (2024-08-05)
|
|
135
|
+
|
|
136
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
137
|
+
|
|
138
|
+
|
|
139
|
+
|
|
140
|
+
|
|
141
|
+
|
|
142
|
+
## [4.30.5](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.30.5-alpha.1...@newskit-render/core@4.30.5) (2024-08-02)
|
|
143
|
+
|
|
144
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
145
|
+
|
|
146
|
+
|
|
147
|
+
|
|
148
|
+
|
|
149
|
+
|
|
150
|
+
## [4.30.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.30.4-alpha.1...@newskit-render/core@4.30.4) (2024-07-31)
|
|
151
|
+
|
|
152
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
153
|
+
|
|
154
|
+
|
|
155
|
+
|
|
156
|
+
|
|
157
|
+
|
|
158
|
+
## [4.30.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.30.3-alpha.0...@newskit-render/core@4.30.3) (2024-07-29)
|
|
159
|
+
|
|
160
|
+
**Note:** Version bump only for package @newskit-render/core
|
|
161
|
+
|
|
162
|
+
|
|
163
|
+
|
|
164
|
+
|
|
165
|
+
|
|
6
166
|
## [4.30.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.30.2-alpha.0...@newskit-render/core@4.30.2) (2024-07-25)
|
|
7
167
|
|
|
8
168
|
**Note:** Version bump only for package @newskit-render/core
|
|
@@ -868,7 +868,9 @@ describe('Personal detail edit pages', () => {
|
|
|
868
868
|
cy.get('[data-testid="select-country"]').click()
|
|
869
869
|
cy.get('[data-testid="United Kingdom"]').should('be.visible')
|
|
870
870
|
|
|
871
|
-
cy.get('[data-testid="
|
|
871
|
+
cy.get('[data-testid="select-panel"]').within(() => {
|
|
872
|
+
cy.get('[data-testid="United States of America"]').click()
|
|
873
|
+
})
|
|
872
874
|
|
|
873
875
|
cy.contains('Save').click()
|
|
874
876
|
|
|
@@ -981,7 +983,9 @@ describe('Personal detail edit pages', () => {
|
|
|
981
983
|
cy.get('[data-testid="select-country"]').click()
|
|
982
984
|
cy.get('[data-testid="United Kingdom"]').should('be.visible')
|
|
983
985
|
|
|
984
|
-
cy.get('[data-testid="
|
|
986
|
+
cy.get('[data-testid="select-panel"]').within(() => {
|
|
987
|
+
cy.get('[data-testid="United States of America"]').click()
|
|
988
|
+
})
|
|
985
989
|
|
|
986
990
|
cy.contains('Save').click()
|
|
987
991
|
|
|
@@ -1022,6 +1026,12 @@ describe('Personal detail edit pages', () => {
|
|
|
1022
1026
|
cy.get('input[name="county"]').type('North Yorkshire')
|
|
1023
1027
|
cy.get('input[name="postcode"]').clear()
|
|
1024
1028
|
cy.get('input[name="postcode"]').type('YO1 6DJ')
|
|
1029
|
+
cy.get('[data-testid="select-country"]').click()
|
|
1030
|
+
cy.get('[data-testid="United Kingdom"]').should('be.visible')
|
|
1031
|
+
|
|
1032
|
+
cy.get('[data-testid="select-panel"]').within(() => {
|
|
1033
|
+
cy.get('[data-testid="United Kingdom"]').click()
|
|
1034
|
+
})
|
|
1025
1035
|
|
|
1026
1036
|
cy.contains('Save').click()
|
|
1027
1037
|
|
|
@@ -1059,6 +1069,10 @@ describe('Personal detail edit pages', () => {
|
|
|
1059
1069
|
cy.get('input[name="city"]').type('London')
|
|
1060
1070
|
cy.get('input[name="postcode"]').clear()
|
|
1061
1071
|
cy.get('input[name="postcode"]').type('SE1')
|
|
1072
|
+
cy.get('[data-testid="select-country"]').click()
|
|
1073
|
+
cy.get('[data-testid="select-panel"]').within(() => {
|
|
1074
|
+
cy.get('[data-testid="United Kingdom"]').click()
|
|
1075
|
+
})
|
|
1062
1076
|
|
|
1063
1077
|
cy.contains('Save').click()
|
|
1064
1078
|
|
|
@@ -213,7 +213,7 @@ describe('Subscription and billing details for Print user', () => {
|
|
|
213
213
|
it('Should display Your deliveries section', () => {
|
|
214
214
|
cy.contains('[data-testid="ContentListIntroduction"]', 'Your deliveries')
|
|
215
215
|
cy.contains('Address')
|
|
216
|
-
cy.contains('Buckingham Palace, London, SW1A
|
|
216
|
+
cy.contains('Buckingham Palace, London, SW1A')
|
|
217
217
|
cy.contains('Delivery instructions')
|
|
218
218
|
cy.contains('On my doorstep')
|
|
219
219
|
cy.contains('Holiday Stops')
|
|
@@ -254,7 +254,7 @@ describe('Subscription and billing details for Print user', () => {
|
|
|
254
254
|
'If your voucher booklet hasn’t arrived within three days of your booklet start date, or you have any issues regarding your vouchers, please contact us.'
|
|
255
255
|
)
|
|
256
256
|
cy.contains('Voucher booklet start date')
|
|
257
|
-
cy.contains('
|
|
257
|
+
cy.contains('20/09/2022')
|
|
258
258
|
cy.contains(
|
|
259
259
|
'Your contact address will be used for any of your deliveries. This can be managed via Personal details'
|
|
260
260
|
)
|
|
@@ -307,7 +307,8 @@ describe('Subscription and billing details for Paypal user', () => {
|
|
|
307
307
|
cy.get('a[href="/account/payment"]').should('be.visible').click()
|
|
308
308
|
cy.contains(
|
|
309
309
|
'[data-testid="Zuora-inline"]',
|
|
310
|
-
'To update your Paypal credentials, please speak to one of our advisors on xxxx-xxx-xxxx or add a new payment method via credit/debit card using the form below.'
|
|
310
|
+
'To update your Paypal credentials, please speak to one of our advisors on xxxx-xxx-xxxx or add a new payment method via credit/debit card using the form below.',
|
|
311
|
+
{ timeout: 15000 }
|
|
311
312
|
)
|
|
312
313
|
})
|
|
313
314
|
})
|
package/cypress/support/users.js
CHANGED
|
@@ -22,37 +22,37 @@ export const userMap = {
|
|
|
22
22
|
},
|
|
23
23
|
tnl: {
|
|
24
24
|
username: 'cmp1aug2022printstag@yopmail.com', //Print user
|
|
25
|
-
password: '
|
|
25
|
+
password: 'Password123Testing123$',
|
|
26
26
|
},
|
|
27
27
|
digitalCard: {
|
|
28
28
|
//dtc=false
|
|
29
29
|
username: 'cmp-digi-card-20-09-22@yopmail.com',
|
|
30
|
-
password: '
|
|
30
|
+
password: 'Password123Testing123$',
|
|
31
31
|
},
|
|
32
32
|
digitalDirectDebit: {
|
|
33
33
|
//dtc=false
|
|
34
34
|
username: 'cmp-digi-direct-20-09-22@yopmail.com',
|
|
35
|
-
password: '
|
|
35
|
+
password: 'Password123Testing123$',
|
|
36
36
|
},
|
|
37
37
|
print: {
|
|
38
38
|
//dtc=true
|
|
39
39
|
username: 'cmp-dtc-card-20-09-22@yopmail.com',
|
|
40
|
-
password: '
|
|
40
|
+
password: 'Password123Testing123$',
|
|
41
41
|
},
|
|
42
42
|
printVouchers: {
|
|
43
43
|
//dtc=false
|
|
44
44
|
username: 'cmp-test-direct-20-09-22@yopmail.com',
|
|
45
|
-
password: '
|
|
45
|
+
password: 'Password123Testing123$',
|
|
46
46
|
},
|
|
47
47
|
digiprint: {
|
|
48
48
|
//dtc=true
|
|
49
49
|
username: 'digi-print.dtc.test@yopmail.com',
|
|
50
|
-
password: '
|
|
50
|
+
password: 'Password123Testing123$',
|
|
51
51
|
},
|
|
52
52
|
digiprintVouchers: {
|
|
53
53
|
//dtc=false
|
|
54
54
|
username: 'digi-print-card-15-11-22@yopmail.com',
|
|
55
|
-
password: '
|
|
55
|
+
password: 'Password123Testing123$',
|
|
56
56
|
},
|
|
57
57
|
}
|
|
58
58
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@newskit-render/core",
|
|
3
|
-
"version": "0.0.0-
|
|
3
|
+
"version": "0.0.0-caeaa514b",
|
|
4
4
|
"description": "Newskit Render - Core package",
|
|
5
5
|
"author": "",
|
|
6
6
|
"license": "UNLICENSED",
|
|
@@ -44,12 +44,12 @@
|
|
|
44
44
|
"@newrelic/winston-enricher": "4.0.1",
|
|
45
45
|
"@newskit-render/api": "^1.12.2",
|
|
46
46
|
"@newskit-render/auth": "^1.8.1",
|
|
47
|
-
"@newskit-render/checkout": "^3.10.
|
|
48
|
-
"@newskit-render/feature-flags": "^1.
|
|
47
|
+
"@newskit-render/checkout": "^3.10.10",
|
|
48
|
+
"@newskit-render/feature-flags": "^1.10.0",
|
|
49
49
|
"@newskit-render/feed": "^1.8.10",
|
|
50
|
-
"@newskit-render/my-account": "^7.
|
|
51
|
-
"@newskit-render/shared-components": "^4.
|
|
52
|
-
"@newskit-render/standalone-components": "^3.21.
|
|
50
|
+
"@newskit-render/my-account": "^7.64.1",
|
|
51
|
+
"@newskit-render/shared-components": "^4.31.4",
|
|
52
|
+
"@newskit-render/standalone-components": "^3.21.10",
|
|
53
53
|
"@newskit-render/validation": "^1.17.1",
|
|
54
54
|
"cross-fetch": "3.1.5",
|
|
55
55
|
"graphql": "16.6.0",
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
2
|
import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
AddField,
|
|
5
|
+
addComponentMap,
|
|
6
|
+
getProviderPropsTimes,
|
|
7
|
+
// getProviderProps,
|
|
8
|
+
} from '@newskit-render/my-account'
|
|
4
9
|
import validation from '../../../validation'
|
|
5
10
|
import { DynamicPage } from '@newskit-render/my-account'
|
|
6
11
|
|
|
@@ -15,20 +20,67 @@ const AccountAddField = (props) => (
|
|
|
15
20
|
)
|
|
16
21
|
|
|
17
22
|
export default AccountAddField
|
|
23
|
+
// export const getServerSideProps = async (context) => {
|
|
24
|
+
// const {
|
|
25
|
+
// params: { field },
|
|
26
|
+
// } = context
|
|
27
|
+
// const doesAddpageExist = Object.keys(addComponentMap).includes(field)
|
|
28
|
+
// replaceConsoleAndSetTransactionName(`Account: add ${field}`)
|
|
29
|
+
|
|
30
|
+
// if (!doesAddpageExist) {
|
|
31
|
+
// context.res.statusCode = 404
|
|
32
|
+
// // Logging the error for being captured by New Relic
|
|
33
|
+
// console.error(`An error ${context.res.statusCode} occurred on server`)
|
|
34
|
+
// }
|
|
35
|
+
|
|
36
|
+
// return {
|
|
37
|
+
// props: { data: { type: field } },
|
|
38
|
+
// }
|
|
39
|
+
// }
|
|
40
|
+
|
|
18
41
|
export const getServerSideProps = async (context) => {
|
|
42
|
+
// const featureFlags = await getAllFeatureFlags(
|
|
43
|
+
// getUserAttributes(context?.req?.headers)
|
|
44
|
+
// )
|
|
45
|
+
|
|
19
46
|
const {
|
|
20
47
|
params: { field },
|
|
21
48
|
} = context
|
|
22
|
-
const
|
|
49
|
+
const doesAddPageExist = Object.keys(addComponentMap).includes(field)
|
|
50
|
+
|
|
23
51
|
replaceConsoleAndSetTransactionName(`Account: add ${field}`)
|
|
24
52
|
|
|
25
|
-
|
|
53
|
+
const defaultPageResponse = {
|
|
54
|
+
props: { data: { type: field }, requestHeaders: context.req.headers },
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
const getProviderPropsResponse = (await getProviderPropsTimes({
|
|
58
|
+
...context,
|
|
59
|
+
provider: 'AddField',
|
|
60
|
+
})) as unknown as { props: unknown }
|
|
61
|
+
console.log('getProviderPropsResponse', getProviderPropsResponse)
|
|
62
|
+
|
|
63
|
+
if (!doesAddPageExist) {
|
|
26
64
|
context.res.statusCode = 404
|
|
27
65
|
// Logging the error for being captured by New Relic
|
|
28
66
|
console.error(`An error ${context.res.statusCode} occurred on server`)
|
|
67
|
+
|
|
68
|
+
// The 404 logic for non-existent [add] components is added in the DynamicPage
|
|
69
|
+
return defaultPageResponse
|
|
29
70
|
}
|
|
30
71
|
|
|
31
|
-
|
|
32
|
-
|
|
72
|
+
const { isUserFamilyAccountPrimary } =
|
|
73
|
+
// @ts-ignore
|
|
74
|
+
getProviderPropsResponse.props.user
|
|
75
|
+
|
|
76
|
+
if (field === 'family' && !isUserFamilyAccountPrimary) {
|
|
77
|
+
return {
|
|
78
|
+
redirect: {
|
|
79
|
+
permanent: false,
|
|
80
|
+
destination: '/404',
|
|
81
|
+
},
|
|
82
|
+
}
|
|
33
83
|
}
|
|
84
|
+
|
|
85
|
+
return defaultPageResponse
|
|
34
86
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
2
|
import { Cancellation, getProviderProps } from '@newskit-render/my-account'
|
|
3
3
|
import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
|
|
4
|
-
import {
|
|
4
|
+
import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
|
|
5
5
|
import validation from '../../../validation'
|
|
6
6
|
|
|
7
7
|
const AccountCancellation = (props) => (
|
|
@@ -13,7 +13,7 @@ export default AccountCancellation
|
|
|
13
13
|
export const getServerSideProps = async (context) => {
|
|
14
14
|
replaceConsoleAndSetTransactionName('Account: Cancellation')
|
|
15
15
|
/* start cra-effected */
|
|
16
|
-
const featureFlags = await
|
|
16
|
+
const featureFlags = await getAllFeatureFlags()
|
|
17
17
|
/* end cra-effected */
|
|
18
18
|
return getProviderProps(
|
|
19
19
|
{ ...context, provider: 'Cancellation' },
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
2
|
import { DreamTeam, getProviderProps } from '@newskit-render/my-account'
|
|
3
3
|
import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
|
|
4
|
-
import {
|
|
4
|
+
import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
|
|
5
5
|
|
|
6
6
|
const AccountNewslettersAndAlerts = (props) => <DreamTeam {...props} />
|
|
7
7
|
|
|
@@ -10,7 +10,7 @@ export default AccountNewslettersAndAlerts
|
|
|
10
10
|
export const getServerSideProps = async (context) => {
|
|
11
11
|
replaceConsoleAndSetTransactionName('Account: Dream Team')
|
|
12
12
|
/* start cra-effected */
|
|
13
|
-
const featureFlags = await
|
|
13
|
+
const featureFlags = await getAllFeatureFlags()
|
|
14
14
|
/* end cra-effected */
|
|
15
15
|
return getProviderProps(
|
|
16
16
|
{ ...context, provider: 'DreamTeam' },
|
|
@@ -2,11 +2,12 @@ import React from 'react'
|
|
|
2
2
|
import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
|
|
3
3
|
import {
|
|
4
4
|
EditField,
|
|
5
|
-
getProviderProps,
|
|
5
|
+
// getProviderProps,
|
|
6
|
+
getProviderPropsTimes,
|
|
6
7
|
editComponentMap,
|
|
7
8
|
DynamicPage,
|
|
8
9
|
} from '@newskit-render/my-account'
|
|
9
|
-
import {
|
|
10
|
+
import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
|
|
10
11
|
import validation from '../../../validation'
|
|
11
12
|
|
|
12
13
|
const AccountEditField = (props) => (
|
|
@@ -35,10 +36,10 @@ export const getServerSideProps = async (context) => {
|
|
|
35
36
|
console.error(`An error ${context.res.statusCode} occurred on server`)
|
|
36
37
|
}
|
|
37
38
|
/* start cra-effected */
|
|
38
|
-
const featureFlags = await
|
|
39
|
+
const featureFlags = await getAllFeatureFlags()
|
|
39
40
|
/* end cra-effected */
|
|
40
41
|
|
|
41
|
-
return
|
|
42
|
+
return getProviderPropsTimes(
|
|
42
43
|
{ ...context, provider: 'EditField' },
|
|
43
44
|
{ featureFlags } /* cra-effected */
|
|
44
45
|
)
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
|
-
import { Family,
|
|
2
|
+
import { Family, getProviderPropsTimes } from '@newskit-render/my-account'
|
|
3
3
|
import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
|
|
4
|
-
import {
|
|
4
|
+
import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
|
|
5
5
|
|
|
6
6
|
const AccountFamily = (props) => <Family {...props} />
|
|
7
7
|
|
|
@@ -10,9 +10,9 @@ export default AccountFamily
|
|
|
10
10
|
export const getServerSideProps = async (context) => {
|
|
11
11
|
replaceConsoleAndSetTransactionName('Account: Family')
|
|
12
12
|
/* start cra-effected */
|
|
13
|
-
const featureFlags = await
|
|
13
|
+
const featureFlags = await getAllFeatureFlags()
|
|
14
14
|
/* end cra-effected */
|
|
15
|
-
return
|
|
15
|
+
return getProviderPropsTimes(
|
|
16
16
|
{ ...context, provider: 'GroupAccounts' },
|
|
17
17
|
{ featureFlags } /* cra-effected */
|
|
18
18
|
)
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
// getProviderProps,
|
|
4
|
+
getProviderPropsTimes,
|
|
5
|
+
HolidayStop,
|
|
6
|
+
} from '@newskit-render/my-account'
|
|
3
7
|
import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
|
|
4
|
-
import {
|
|
8
|
+
import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
|
|
5
9
|
|
|
6
10
|
const AccountHolidayStop = (props) => <HolidayStop {...props} />
|
|
7
11
|
|
|
@@ -10,9 +14,9 @@ export default AccountHolidayStop
|
|
|
10
14
|
export const getServerSideProps = async (context) => {
|
|
11
15
|
replaceConsoleAndSetTransactionName('Account: Book a Holiday Stop')
|
|
12
16
|
/* start cra-effected */
|
|
13
|
-
const featureFlags = await
|
|
17
|
+
const featureFlags = await getAllFeatureFlags()
|
|
14
18
|
/* end cra-effected */
|
|
15
|
-
return
|
|
19
|
+
return getProviderPropsTimes(
|
|
16
20
|
{ ...context, provider: 'HolidayStop' },
|
|
17
21
|
{ featureFlags } /* cra-effected */
|
|
18
22
|
)
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
// getProviderProps,
|
|
4
|
+
getProviderPropsTimes,
|
|
5
|
+
HolidayStopList,
|
|
6
|
+
} from '@newskit-render/my-account'
|
|
3
7
|
import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
|
|
4
8
|
import { holidayStopListContextOverrides } from '../../../context/app-context/holidayStopListContextOverrides'
|
|
5
9
|
|
|
@@ -15,5 +19,5 @@ export default AccountPreviousHolidayStops
|
|
|
15
19
|
|
|
16
20
|
export const getServerSideProps = async (context) => {
|
|
17
21
|
replaceConsoleAndSetTransactionName('Account: Previous Holiday Stops')
|
|
18
|
-
return
|
|
22
|
+
return getProviderPropsTimes({ ...context, provider: 'HolidayStop' })
|
|
19
23
|
}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
// getProviderProps,
|
|
4
|
+
getProviderPropsTimes,
|
|
5
|
+
HolidayStopList,
|
|
6
|
+
} from '@newskit-render/my-account'
|
|
3
7
|
import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
|
|
4
8
|
import { holidayStopListContextOverrides } from '../../../context/app-context/holidayStopListContextOverrides'
|
|
5
9
|
|
|
@@ -15,5 +19,5 @@ export default AccountUpcomingHolidayStops
|
|
|
15
19
|
|
|
16
20
|
export const getServerSideProps = async (context) => {
|
|
17
21
|
replaceConsoleAndSetTransactionName('Account: Upcoming Holiday Stops')
|
|
18
|
-
return
|
|
22
|
+
return getProviderPropsTimes({ ...context, provider: 'HolidayStop' })
|
|
19
23
|
}
|
package/pages/account/index.tsx
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
|
-
import {
|
|
3
|
-
|
|
2
|
+
import {
|
|
3
|
+
PersonalDetails,
|
|
4
|
+
getProviderPropsTimes,
|
|
5
|
+
// getProviderProps,
|
|
6
|
+
} from '@newskit-render/my-account'
|
|
7
|
+
import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
|
|
4
8
|
import { AccountDropdown } from '../../components/AccountDropdown' /* cra-disabled */
|
|
5
9
|
import { replaceConsoleAndSetTransactionName } from '../../helpers/logger'
|
|
6
10
|
|
|
@@ -22,9 +26,9 @@ export default AccountPersonalDetails
|
|
|
22
26
|
export const getServerSideProps = async (context) => {
|
|
23
27
|
replaceConsoleAndSetTransactionName('Account: Personal details')
|
|
24
28
|
|
|
25
|
-
const featureFlags = await
|
|
29
|
+
const featureFlags = await getAllFeatureFlags()
|
|
26
30
|
|
|
27
|
-
return
|
|
31
|
+
return getProviderPropsTimes(
|
|
28
32
|
{ ...context, provider: 'PersonalDetails' },
|
|
29
33
|
{ featureFlags } /* cra-effected */
|
|
30
34
|
)
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
|
-
import { Newsletters,
|
|
2
|
+
import { Newsletters, getProviderPropsTimes } from '@newskit-render/my-account'
|
|
3
3
|
import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
|
|
4
|
-
import {
|
|
4
|
+
import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
|
|
5
5
|
|
|
6
6
|
const AccountNewsletters = (props) => <Newsletters {...props} />
|
|
7
7
|
|
|
@@ -10,9 +10,9 @@ export default AccountNewsletters
|
|
|
10
10
|
export const getServerSideProps = async (context) => {
|
|
11
11
|
replaceConsoleAndSetTransactionName('Account: Newsletters')
|
|
12
12
|
/* start cra-effected */
|
|
13
|
-
const featureFlags = await
|
|
13
|
+
const featureFlags = await getAllFeatureFlags()
|
|
14
14
|
/* end cra-effected */
|
|
15
|
-
return
|
|
15
|
+
return getProviderPropsTimes(
|
|
16
16
|
{ ...context, provider: 'Newsletters' },
|
|
17
17
|
{ featureFlags } /* cra-effected */
|
|
18
18
|
)
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
2
|
import {
|
|
3
3
|
NewslettersAndAlerts,
|
|
4
|
-
|
|
4
|
+
getProviderPropsTimes,
|
|
5
|
+
// getProviderProps
|
|
5
6
|
} from '@newskit-render/my-account'
|
|
6
7
|
import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
|
|
7
|
-
import {
|
|
8
|
+
import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
|
|
8
9
|
|
|
9
10
|
const AccountNewslettersAndAlerts = (props) => (
|
|
10
11
|
<NewslettersAndAlerts {...props} />
|
|
@@ -15,9 +16,9 @@ export default AccountNewslettersAndAlerts
|
|
|
15
16
|
export const getServerSideProps = async (context) => {
|
|
16
17
|
replaceConsoleAndSetTransactionName('Account: Newsletters and Alerts')
|
|
17
18
|
/* start cra-effected */
|
|
18
|
-
const featureFlags = await
|
|
19
|
+
const featureFlags = await getAllFeatureFlags()
|
|
19
20
|
/* end cra-effected */
|
|
20
|
-
return
|
|
21
|
+
return getProviderPropsTimes(
|
|
21
22
|
{ ...context, provider: 'NewslettersAndAlerts' },
|
|
22
23
|
{ featureFlags } /* cra-effected */
|
|
23
24
|
)
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
2
|
import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
|
|
3
3
|
import {
|
|
4
|
-
getProviderProps,
|
|
4
|
+
// getProviderProps,
|
|
5
|
+
getProviderPropsTimes,
|
|
5
6
|
Payment,
|
|
6
7
|
paymentMethodsMap,
|
|
7
8
|
DynamicPage,
|
|
8
9
|
} from '@newskit-render/my-account'
|
|
9
|
-
import {
|
|
10
|
+
import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
|
|
10
11
|
|
|
11
12
|
const PaymentPage = (props) => {
|
|
12
13
|
return (
|
|
@@ -24,10 +25,10 @@ export default PaymentPage
|
|
|
24
25
|
export const getServerSideProps = async (context) => {
|
|
25
26
|
replaceConsoleAndSetTransactionName('Payment method')
|
|
26
27
|
/* start cra-effected */
|
|
27
|
-
const featureFlags = await
|
|
28
|
+
const featureFlags = await getAllFeatureFlags()
|
|
28
29
|
/* end cra-effected */
|
|
29
30
|
|
|
30
|
-
return
|
|
31
|
+
return getProviderPropsTimes(
|
|
31
32
|
{
|
|
32
33
|
...context,
|
|
33
34
|
provider: 'Payment',
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
2
|
import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
|
|
3
3
|
import { Payment, getProviderProps } from '@newskit-render/my-account'
|
|
4
|
-
import {
|
|
4
|
+
import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
|
|
5
5
|
|
|
6
6
|
const AccountPayment = (props) => <Payment {...props} />
|
|
7
7
|
|
|
@@ -10,7 +10,7 @@ export default AccountPayment
|
|
|
10
10
|
export const getServerSideProps = async (context) => {
|
|
11
11
|
replaceConsoleAndSetTransactionName('Edit Payment method')
|
|
12
12
|
/* start cra-effected */
|
|
13
|
-
const featureFlags = await
|
|
13
|
+
const featureFlags = await getAllFeatureFlags()
|
|
14
14
|
/* end cra-effected */
|
|
15
15
|
|
|
16
16
|
return getProviderProps(
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
|
-
import {
|
|
3
|
-
|
|
2
|
+
import {
|
|
3
|
+
// getProviderProps,
|
|
4
|
+
getProviderPropsTimes,
|
|
5
|
+
PaymentMethods,
|
|
6
|
+
} from '@newskit-render/my-account'
|
|
7
|
+
import { getAllFeatureFlags } from '@newskit-render/feature-flags' // create-render-app effected
|
|
4
8
|
import { paymentMethodContext } from '../../../context/app-context/paymentMethodContext'
|
|
5
9
|
import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
|
|
6
10
|
|
|
@@ -12,9 +16,9 @@ export default AccountPaymentMethods
|
|
|
12
16
|
|
|
13
17
|
export const getServerSideProps = async (context) => {
|
|
14
18
|
replaceConsoleAndSetTransactionName('Account: Payment Methods')
|
|
15
|
-
const featureFlags = await
|
|
19
|
+
const featureFlags = await getAllFeatureFlags()
|
|
16
20
|
// create-render-app effected
|
|
17
|
-
return
|
|
21
|
+
return getProviderPropsTimes(
|
|
18
22
|
{ ...context, provider: 'PaymentMethods' },
|
|
19
23
|
{ featureFlags } // create-render-app effected
|
|
20
24
|
)
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
2
|
import {
|
|
3
3
|
SubscriptionAndBilling,
|
|
4
|
-
|
|
4
|
+
getProviderPropsTimes,
|
|
5
|
+
// getProviderProps,
|
|
5
6
|
} from '@newskit-render/my-account'
|
|
6
|
-
import {
|
|
7
|
+
import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
|
|
7
8
|
import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
|
|
8
9
|
|
|
9
10
|
const AccountSubscriptionAndBilling = (props) => (
|
|
@@ -15,9 +16,9 @@ export default AccountSubscriptionAndBilling
|
|
|
15
16
|
export const getServerSideProps = async (context) => {
|
|
16
17
|
replaceConsoleAndSetTransactionName('Account: Subscription and Billing')
|
|
17
18
|
/* start cra-effected */
|
|
18
|
-
const featureFlags = await
|
|
19
|
+
const featureFlags = await getAllFeatureFlags()
|
|
19
20
|
/* end cra-effected */
|
|
20
|
-
const result = await
|
|
21
|
+
const result = await getProviderPropsTimes(
|
|
21
22
|
{
|
|
22
23
|
...context,
|
|
23
24
|
provider: 'SubscriptionAndBilling',
|
|
@@ -4,7 +4,7 @@ import {
|
|
|
4
4
|
getProviderProps,
|
|
5
5
|
} from '@newskit-render/my-account'
|
|
6
6
|
import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
|
|
7
|
-
import {
|
|
7
|
+
import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
|
|
8
8
|
|
|
9
9
|
const UserHub = (props) => <UserHubPage {...props} />
|
|
10
10
|
|
|
@@ -13,7 +13,7 @@ export default UserHub
|
|
|
13
13
|
export const getServerSideProps = async (context) => {
|
|
14
14
|
replaceConsoleAndSetTransactionName('Account: UserHub')
|
|
15
15
|
/* start cra-effected */
|
|
16
|
-
const featureFlags = await
|
|
16
|
+
const featureFlags = await getAllFeatureFlags()
|
|
17
17
|
/* end cra-effected */
|
|
18
18
|
return getProviderProps(
|
|
19
19
|
{ ...context, provider: 'PersonalDetails' },
|