@newskit-render/core 0.0.0-e16014a0 → 0.0.0-e32035419

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.
Files changed (31) hide show
  1. package/CHANGELOG.md +400 -0
  2. package/__tests__/pages/__snapshots__/home.test.tsx.snap +1 -4
  3. package/components/article/__tests__/__snapshots__/index.test.tsx.snap +1 -4
  4. package/cypress/e2e/account/newsletters-page.cy.js +21 -2
  5. package/cypress/e2e/account/personal-details.cy.js +16 -2
  6. package/cypress/e2e/account/subscription-and-billing.cy.js +6 -5
  7. package/cypress/support/blaizeJwtValues.js +3 -0
  8. package/cypress/support/commands.js +8 -3
  9. package/cypress/support/users.js +7 -7
  10. package/helpers/getProviderPropsUtil.ts +17 -0
  11. package/package.json +10 -10
  12. package/pages/account/add/[field].tsx +11 -2
  13. package/pages/account/cancellation/index.tsx +5 -4
  14. package/pages/account/delete/confirm/index.tsx +3 -5
  15. package/pages/account/delete/error/index.tsx +3 -5
  16. package/pages/account/delete/index.tsx +3 -5
  17. package/pages/account/delete/success/index.tsx +3 -5
  18. package/pages/account/dream-team/index.tsx +5 -4
  19. package/pages/account/edit/[field].tsx +4 -4
  20. package/pages/account/family/index.tsx +9 -5
  21. package/pages/account/holiday-stop/index.tsx +5 -4
  22. package/pages/account/holiday-stop/previous-holiday-stops.tsx +3 -2
  23. package/pages/account/holiday-stop/upcoming-holiday-stops.tsx +3 -2
  24. package/pages/account/index.tsx +5 -6
  25. package/pages/account/newsletters/index.tsx +5 -4
  26. package/pages/account/newsletters-and-alerts/index.tsx +5 -7
  27. package/pages/account/payment/[paymentMethod].tsx +4 -4
  28. package/pages/account/payment/index.tsx +5 -4
  29. package/pages/account/payment-methods/index.tsx +5 -4
  30. package/pages/account/subscription-and-billing/index.tsx +5 -7
  31. package/pages/account/user-hub/index.tsx +20 -0
package/CHANGELOG.md CHANGED
@@ -3,6 +3,406 @@
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.37.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.37.1-alpha.0...@newskit-render/core@4.37.1) (2024-10-17)
7
+
8
+ **Note:** Version bump only for package @newskit-render/core
9
+
10
+
11
+
12
+
13
+
14
+ # [4.37.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.37.0-alpha.0...@newskit-render/core@4.37.0) (2024-10-16)
15
+
16
+ **Note:** Version bump only for package @newskit-render/core
17
+
18
+
19
+
20
+
21
+
22
+ ## [4.36.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.36.2-alpha.0...@newskit-render/core@4.36.2) (2024-10-16)
23
+
24
+ **Note:** Version bump only for package @newskit-render/core
25
+
26
+
27
+
28
+
29
+
30
+ ## [4.36.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.36.1-alpha.0...@newskit-render/core@4.36.1) (2024-10-15)
31
+
32
+ **Note:** Version bump only for package @newskit-render/core
33
+
34
+
35
+
36
+
37
+
38
+ # [4.36.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.36.0-alpha.0...@newskit-render/core@4.36.0) (2024-10-15)
39
+
40
+ **Note:** Version bump only for package @newskit-render/core
41
+
42
+
43
+
44
+
45
+
46
+ ## [4.35.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.35.3-alpha.0...@newskit-render/core@4.35.3) (2024-10-11)
47
+
48
+ **Note:** Version bump only for package @newskit-render/core
49
+
50
+
51
+
52
+
53
+
54
+ ## [4.35.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.35.2-alpha.0...@newskit-render/core@4.35.2) (2024-10-11)
55
+
56
+ **Note:** Version bump only for package @newskit-render/core
57
+
58
+
59
+
60
+
61
+
62
+ ## [4.35.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.35.1-alpha.2...@newskit-render/core@4.35.1) (2024-10-10)
63
+
64
+ **Note:** Version bump only for package @newskit-render/core
65
+
66
+
67
+
68
+
69
+
70
+ # [4.35.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.35.0-alpha.0...@newskit-render/core@4.35.0) (2024-10-02)
71
+
72
+ **Note:** Version bump only for package @newskit-render/core
73
+
74
+
75
+
76
+
77
+
78
+ ## [4.34.7](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.7-alpha.0...@newskit-render/core@4.34.7) (2024-09-25)
79
+
80
+ **Note:** Version bump only for package @newskit-render/core
81
+
82
+
83
+
84
+
85
+
86
+ ## [4.34.6](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.6-alpha.0...@newskit-render/core@4.34.6) (2024-09-20)
87
+
88
+ **Note:** Version bump only for package @newskit-render/core
89
+
90
+
91
+
92
+
93
+
94
+ ## [4.34.5](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.5-alpha.0...@newskit-render/core@4.34.5) (2024-09-20)
95
+
96
+ **Note:** Version bump only for package @newskit-render/core
97
+
98
+
99
+
100
+
101
+
102
+ ## [4.34.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.4-alpha.0...@newskit-render/core@4.34.4) (2024-09-19)
103
+
104
+ **Note:** Version bump only for package @newskit-render/core
105
+
106
+
107
+
108
+
109
+
110
+ ## [4.34.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.3-alpha.0...@newskit-render/core@4.34.3) (2024-09-18)
111
+
112
+ **Note:** Version bump only for package @newskit-render/core
113
+
114
+
115
+
116
+
117
+
118
+ ## [4.34.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.2-alpha.1...@newskit-render/core@4.34.2) (2024-09-16)
119
+
120
+ **Note:** Version bump only for package @newskit-render/core
121
+
122
+
123
+
124
+
125
+
126
+ ## [4.34.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.1-alpha.0...@newskit-render/core@4.34.1) (2024-09-13)
127
+
128
+ **Note:** Version bump only for package @newskit-render/core
129
+
130
+
131
+
132
+
133
+
134
+ # [4.34.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.34.0-alpha.0...@newskit-render/core@4.34.0) (2024-09-12)
135
+
136
+ **Note:** Version bump only for package @newskit-render/core
137
+
138
+
139
+
140
+
141
+
142
+ ## [4.33.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.33.1-alpha.0...@newskit-render/core@4.33.1) (2024-09-10)
143
+
144
+ **Note:** Version bump only for package @newskit-render/core
145
+
146
+
147
+
148
+
149
+
150
+ # [4.33.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.33.0-alpha.0...@newskit-render/core@4.33.0) (2024-09-10)
151
+
152
+ **Note:** Version bump only for package @newskit-render/core
153
+
154
+
155
+
156
+
157
+
158
+ ## [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)
159
+
160
+ **Note:** Version bump only for package @newskit-render/core
161
+
162
+
163
+
164
+
165
+
166
+ # [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)
167
+
168
+ **Note:** Version bump only for package @newskit-render/core
169
+
170
+
171
+
172
+
173
+
174
+ ## [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)
175
+
176
+ **Note:** Version bump only for package @newskit-render/core
177
+
178
+
179
+
180
+
181
+
182
+ ## [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)
183
+
184
+ **Note:** Version bump only for package @newskit-render/core
185
+
186
+
187
+
188
+
189
+
190
+ ## [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)
191
+
192
+ **Note:** Version bump only for package @newskit-render/core
193
+
194
+
195
+
196
+
197
+
198
+ ## [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)
199
+
200
+ **Note:** Version bump only for package @newskit-render/core
201
+
202
+
203
+
204
+
205
+
206
+ ## [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)
207
+
208
+ **Note:** Version bump only for package @newskit-render/core
209
+
210
+
211
+
212
+
213
+
214
+ ## [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)
215
+
216
+ **Note:** Version bump only for package @newskit-render/core
217
+
218
+
219
+
220
+
221
+
222
+ ## [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)
223
+
224
+ **Note:** Version bump only for package @newskit-render/core
225
+
226
+
227
+
228
+
229
+
230
+ ## [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)
231
+
232
+ **Note:** Version bump only for package @newskit-render/core
233
+
234
+
235
+
236
+
237
+
238
+ ## [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)
239
+
240
+ **Note:** Version bump only for package @newskit-render/core
241
+
242
+
243
+
244
+
245
+
246
+ ## [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)
247
+
248
+ **Note:** Version bump only for package @newskit-render/core
249
+
250
+
251
+
252
+
253
+
254
+ ## [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)
255
+
256
+ **Note:** Version bump only for package @newskit-render/core
257
+
258
+
259
+
260
+
261
+
262
+ # [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)
263
+
264
+ **Note:** Version bump only for package @newskit-render/core
265
+
266
+
267
+
268
+
269
+
270
+ ## [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)
271
+
272
+ **Note:** Version bump only for package @newskit-render/core
273
+
274
+
275
+
276
+
277
+
278
+ ## [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)
279
+
280
+ **Note:** Version bump only for package @newskit-render/core
281
+
282
+
283
+
284
+
285
+
286
+ ## [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)
287
+
288
+ **Note:** Version bump only for package @newskit-render/core
289
+
290
+
291
+
292
+
293
+
294
+ ## [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)
295
+
296
+ **Note:** Version bump only for package @newskit-render/core
297
+
298
+
299
+
300
+
301
+
302
+ ## [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)
303
+
304
+ **Note:** Version bump only for package @newskit-render/core
305
+
306
+
307
+
308
+
309
+
310
+ ## [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)
311
+
312
+ **Note:** Version bump only for package @newskit-render/core
313
+
314
+
315
+
316
+
317
+
318
+ ## [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)
319
+
320
+ **Note:** Version bump only for package @newskit-render/core
321
+
322
+
323
+
324
+
325
+
326
+ ## [4.30.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.30.1-alpha.0...@newskit-render/core@4.30.1) (2024-07-23)
327
+
328
+ **Note:** Version bump only for package @newskit-render/core
329
+
330
+
331
+
332
+
333
+
334
+ # [4.30.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.30.0-alpha.0...@newskit-render/core@4.30.0) (2024-07-23)
335
+
336
+ **Note:** Version bump only for package @newskit-render/core
337
+
338
+
339
+
340
+
341
+
342
+ ## [4.29.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.29.2-alpha.0...@newskit-render/core@4.29.2) (2024-07-23)
343
+
344
+ **Note:** Version bump only for package @newskit-render/core
345
+
346
+
347
+
348
+
349
+
350
+ ## [4.29.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.29.1-alpha.0...@newskit-render/core@4.29.1) (2024-07-18)
351
+
352
+ **Note:** Version bump only for package @newskit-render/core
353
+
354
+
355
+
356
+
357
+
358
+ # [4.29.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.29.0-alpha.0...@newskit-render/core@4.29.0) (2024-07-17)
359
+
360
+ **Note:** Version bump only for package @newskit-render/core
361
+
362
+
363
+
364
+
365
+
366
+ ## [4.28.4](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.28.4-alpha.0...@newskit-render/core@4.28.4) (2024-07-16)
367
+
368
+ **Note:** Version bump only for package @newskit-render/core
369
+
370
+
371
+
372
+
373
+
374
+ ## [4.28.3](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.28.3-alpha.0...@newskit-render/core@4.28.3) (2024-07-11)
375
+
376
+ **Note:** Version bump only for package @newskit-render/core
377
+
378
+
379
+
380
+
381
+
382
+ ## [4.28.2](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.28.2-alpha.0...@newskit-render/core@4.28.2) (2024-07-11)
383
+
384
+ **Note:** Version bump only for package @newskit-render/core
385
+
386
+
387
+
388
+
389
+
390
+ ## [4.28.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.28.1-alpha.0...@newskit-render/core@4.28.1) (2024-07-11)
391
+
392
+ **Note:** Version bump only for package @newskit-render/core
393
+
394
+
395
+
396
+
397
+
398
+ # [4.28.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.28.0-alpha.0...@newskit-render/core@4.28.0) (2024-07-08)
399
+
400
+ **Note:** Version bump only for package @newskit-render/core
401
+
402
+
403
+
404
+
405
+
6
406
  # [4.27.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.27.0-alpha.0...@newskit-render/core@4.27.0) (2024-06-14)
7
407
 
8
408
  **Note:** Version bump only for package @newskit-render/core
@@ -6,7 +6,7 @@ exports[`getServerSideProps Homepage 1`] = `
6
6
  class="css-1d2q07x"
7
7
  >
8
8
  <div
9
- class="css-hpal4s"
9
+ class="css-w8ogm"
10
10
  data-testid="NavigationPrimary"
11
11
  >
12
12
  <div
@@ -102,7 +102,6 @@ exports[`getServerSideProps Homepage 1`] = `
102
102
  aria-label="Section One Link"
103
103
  class="css-1ulbpfm"
104
104
  href="/section-one"
105
- type="standalone"
106
105
  >
107
106
  <span
108
107
  class="css-1xnclyu"
@@ -126,7 +125,6 @@ exports[`getServerSideProps Homepage 1`] = `
126
125
  aria-label="Section Two Link"
127
126
  class="css-1ulbpfm"
128
127
  href="/section-two"
129
- type="standalone"
130
128
  >
131
129
  <span
132
130
  class="css-1xnclyu"
@@ -150,7 +148,6 @@ exports[`getServerSideProps Homepage 1`] = `
150
148
  aria-label="Section Three Link"
151
149
  class="css-1ulbpfm"
152
150
  href="/section-three"
153
- type="standalone"
154
151
  >
155
152
  <span
156
153
  class="css-1xnclyu"
@@ -6,7 +6,7 @@ exports[`Article should render tile and sub title 1`] = `
6
6
  class="css-1d2q07x"
7
7
  >
8
8
  <div
9
- class="css-hpal4s"
9
+ class="css-w8ogm"
10
10
  data-testid="NavigationPrimary"
11
11
  >
12
12
  <div
@@ -102,7 +102,6 @@ exports[`Article should render tile and sub title 1`] = `
102
102
  aria-label="Section One Link"
103
103
  class="css-1ulbpfm"
104
104
  href="/section-one"
105
- type="standalone"
106
105
  >
107
106
  <span
108
107
  class="css-1xnclyu"
@@ -126,7 +125,6 @@ exports[`Article should render tile and sub title 1`] = `
126
125
  aria-label="Section Two Link"
127
126
  class="css-1ulbpfm"
128
127
  href="/section-two"
129
- type="standalone"
130
128
  >
131
129
  <span
132
130
  class="css-1xnclyu"
@@ -150,7 +148,6 @@ exports[`Article should render tile and sub title 1`] = `
150
148
  aria-label="Section Three Link"
151
149
  class="css-1ulbpfm"
152
150
  href="/section-three"
153
- type="standalone"
154
151
  >
155
152
  <span
156
153
  class="css-1xnclyu"
@@ -1,10 +1,16 @@
1
+ import {
2
+ registration_blaize_jwt,
3
+ subscription_blaize_jwt,
4
+ } from '../../support/blaizeJwtValues'
5
+
1
6
  describe('Newsletters page', () => {
2
7
  beforeEach(() => {
3
8
  cy.GetTnlAcsSession()
4
- cy.mockConsentAndVisit('/account/newsletters')
9
+ cy.mockConsent()
5
10
  })
6
11
 
7
- it('Should display the newsletters page', () => {
12
+ it('Should display all the newsletters on the newsletters page when user is subscribed', () => {
13
+ cy.mockBlaizeJwtAndVisit(subscription_blaize_jwt, '/account/newsletters')
8
14
  cy.contains('Newsletters')
9
15
  cy.contains(
10
16
  'Exclusive content and a curated selection of our top stories straight to your inbox.'
@@ -12,7 +18,18 @@ describe('Newsletters page', () => {
12
18
  cy.get('[data-testid="newsletters-grid"] > div').should('have.length', 20)
13
19
  })
14
20
 
21
+ // Commented out because Optimizely feature flag with tm-my-account key is causing it to fail in this repo. Test should be re-enabled once feature flag is removed.
22
+ // it('Should only display selected newsletters on the newsletters page when user is registered', () => {
23
+ // cy.mockBlaizeJwtAndVisit(registration_blaize_jwt, '/account/newsletters')
24
+ // cy.contains('Newsletters')
25
+ // cy.contains(
26
+ // 'Exclusive content and a curated selection of our top stories straight to your inbox.'
27
+ // )
28
+ // cy.get('[data-testid="newsletters-grid"] > div').should('have.length', 12)
29
+ // })
30
+
15
31
  it('Should display all required newsletter text in the first grid card', () => {
32
+ cy.mockBlaizeJwtAndVisit(subscription_blaize_jwt, '/account/newsletters')
16
33
  cy.get('[data-testid="newsletters-grid"]').then(($parentDiv) => {
17
34
  const firstNewsletter = $parentDiv.find('div:first-child')
18
35
 
@@ -27,6 +44,7 @@ describe('Newsletters page', () => {
27
44
  })
28
45
 
29
46
  it('Should successfully subscribe to a newsletter', () => {
47
+ cy.mockBlaizeJwtAndVisit(subscription_blaize_jwt, '/account/newsletters')
30
48
  cy.get('[data-testid="newsletters-grid"]').then(($parentDiv) => {
31
49
  cy.intercept('POST', '/api/account/mutate', { statusCode: 200, ok: true })
32
50
 
@@ -46,6 +64,7 @@ describe('Newsletters page', () => {
46
64
  })
47
65
 
48
66
  it('Should show the error toast on server error', () => {
67
+ cy.mockBlaizeJwtAndVisit(subscription_blaize_jwt, '/account/newsletters')
49
68
  cy.get('[data-testid="newsletters-grid"]').then(($parentDiv) => {
50
69
  cy.intercept('POST', '/api/account/mutate', {
51
70
  statusCode: 500,
@@ -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="United States of America"]').click()
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="United States of America"]').click()
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
 
@@ -134,8 +134,8 @@ describe('Subscription and billing details for Digital user', () => {
134
134
  cy.contains('[data-testid="ContentListIntroduction"]', 'Billing details')
135
135
  cy.contains('Payment method')
136
136
  cy.get('[data-testid="visa-icon"]').should('exist')
137
- cy.contains('************1111')
138
- cy.contains('expiry date 03/30')
137
+ cy.contains('************4242')
138
+ cy.contains('expiry date 02/27')
139
139
  })
140
140
 
141
141
  it('Should display Invoice history section', () => {
@@ -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 1AA')
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('16/06/24')
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
  })
@@ -0,0 +1,3 @@
1
+ export const subscription_blaize_jwt = 'eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ7XCJjcG5cIjpcIkFBQUEwMjU1OTcwNDVcIixcInByb2R1Y3RzXCI6W1wiVGhlIFRpbWVzIFNpdGUgUHJvZHVjdFwiLFwiVGltZXMgU3BvcnRzIEFwcFwiLFwiVGhlIFRpbWVzIEVQTCBWaWRlbyBQcm9kdWN0XCIsXCJUaGUgU3VuZGF5IFRpbWVzIGlQaG9uZSBhcHAgcHJvZHVjdFwiLFwiRW1haWwgQnVsbGV0aW5zIFByb2R1Y3RcIixcIlRoZSBTdW5kYXkgVGltZXMgTW9iaSBQcm9kdWN0XCIsXCJUaGUgU3VuZGF5IFRpbWVzIGlQYWQgYXBwIHByb2R1Y3RcIixcImUtcGFwZXIgUHJvZHVjdFwiLFwiRGFpbHkgQ3Jvc3N3b3JkIFByb2R1Y3RcIixcIlRoZSBTdW5kYXkgVGltZXMgU2l0ZSBQcm9kdWN0XCIsXCJUaGUgVGltZXMgTW9iaSBQcm9kdWN0XCIsXCJUaGUgVGltZXMgaVBhZCBhcHAgUHJvZHVjdFwiLFwiRGlnaXRhbCBTdWJzY3JpcHRpb24gUHJvZHVjdFwiLFwiVGhlIFRpbWVzIGlQaG9uZSBhcHAgcHJvZHVjdFwiLFwiVGltZXMrIG1lbWJlcnNoaXAgYmVuZWZpdHMgUHJvZHVjdFwiXX0iLCJodHRwczpcL1wvdGhldGltZXMuY28udWtcL2NwbiI6IkFBQUEwMjU1OTcwNDUiLCJodHRwczpcL1wvdGhldGltZXMuY28udWtcL3N1YnNjcmlwdGlvbiI6IlNVQi0wMDEwOTcyNjQ0IiwiaXNzIjoiLnRoZXRpbWVzLmNvbSIsImh0dHBzOlwvXC90aGV0aW1lcy5jby51a1wvcHJvZHVjdHMiOlsiVGhlIFRpbWVzIFNpdGUgUHJvZHVjdCIsIlRpbWVzIFNwb3J0cyBBcHAiLCJUaGUgVGltZXMgRVBMIFZpZGVvIFByb2R1Y3QiLCJUaGUgU3VuZGF5IFRpbWVzIGlQaG9uZSBhcHAgcHJvZHVjdCIsIkVtYWlsIEJ1bGxldGlucyBQcm9kdWN0IiwiVGhlIFN1bmRheSBUaW1lcyBNb2JpIFByb2R1Y3QiLCJUaGUgU3VuZGF5IFRpbWVzIGlQYWQgYXBwIHByb2R1Y3QiLCJlLXBhcGVyIFByb2R1Y3QiLCJEYWlseSBDcm9zc3dvcmQgUHJvZHVjdCIsIlRoZSBTdW5kYXkgVGltZXMgU2l0ZSBQcm9kdWN0IiwiVGhlIFRpbWVzIE1vYmkgUHJvZHVjdCIsIlRoZSBUaW1lcyBpUGFkIGFwcCBQcm9kdWN0IiwiRGlnaXRhbCBTdWJzY3JpcHRpb24gUHJvZHVjdCIsIlRoZSBUaW1lcyBpUGhvbmUgYXBwIHByb2R1Y3QiLCJUaW1lcysgbWVtYmVyc2hpcCBiZW5lZml0cyBQcm9kdWN0Il0sImV4cCI6MTcxNjk4ODc3OSwiaWF0IjoxNzE2MzgzOTc5fQ.JTqe7UJo985At-2JkuMrH-6H__qzwZwBGRnEJXl4CSM'
2
+
3
+ export const registration_blaize_jwt = 'eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ7XCJjcG5cIjpcIkNQTi1YNlpOWFBRUlFcIixcInByb2R1Y3RzXCI6W119IiwiaHR0cHM6XC9cL3RoZXRpbWVzLmNvLnVrXC9jcG4iOiJDUE4tWDZaTlhQUVJRIiwiaHR0cHM6XC9cL3RoZXRpbWVzLmNvLnVrXC9zdWJzY3JpcHRpb24iOiJFR0FDQy1DUzAwMDAxMzQ0NjI4IiwiaXNzIjoiLnRoZXRpbWVzLmNvLnVrIiwiaHR0cHM6XC9cL3RoZXRpbWVzLmNvLnVrXC9wcm9kdWN0cyI6W10sImV4cCI6MTcyNTQ1NDgwNCwiaWF0IjoxNzI0ODUwMDA0fQ.XGTv2XooQ8VELZsc7bl35D0A9FlOvEWpexNlYpCCK1Q'
@@ -1,4 +1,4 @@
1
- //Note: Check periodically if these consent cookie values exprire
1
+ //Note: Check periodically if these consent cookie values expire
2
2
  import _ from 'lodash'
3
3
  import {
4
4
  consentUUIDValue,
@@ -31,18 +31,23 @@ Cypress.Commands.add('mockConsent', () => {
31
31
  setConsentLocalStorage()
32
32
  })
33
33
 
34
+ Cypress.Commands.add('mockBlaizeJwtAndVisit', (jwtValue, url) => {
35
+ cy.setCookie('blaize_jwt', jwtValue)
36
+ cy.visit(url)
37
+ })
38
+
34
39
  Cypress.Commands.add('GetAcsSession', (user = 'default') => {
35
40
  const { username, password } = userMap[user]
36
41
 
37
42
  cy.request({
38
43
  method: 'POST',
39
- url: 'https://login.staging-thesun.com/services/session',
44
+ url: 'https://login.staging-thesun.co.uk/services/session',
40
45
  headers: {
41
46
  'Content-Type': 'application/vnd.newsuk.acs.createsession-v1+json',
42
47
  },
43
48
  body: {
44
49
  rememberMe: false,
45
- gotoUrl: 'https://login.staging-thesun.com/',
50
+ gotoUrl: 'https://login.staging-thesun.co.uk/',
46
51
  sso: false,
47
52
  authCredentials: {
48
53
  username,
@@ -22,37 +22,37 @@ export const userMap = {
22
22
  },
23
23
  tnl: {
24
24
  username: 'cmp1aug2022printstag@yopmail.com', //Print user
25
- password: 'Password123',
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: 'Password123',
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: 'Password123',
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: 'Password123',
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: 'Password123',
45
+ password: 'Password123Testing123$',
46
46
  },
47
47
  digiprint: {
48
48
  //dtc=true
49
49
  username: 'digi-print.dtc.test@yopmail.com',
50
- password: 'Password123',
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: 'Password123',
55
+ password: 'Password123Testing123$',
56
56
  },
57
57
  }
58
58
 
@@ -0,0 +1,17 @@
1
+ import {
2
+ getProviderProps,
3
+ getProviderPropsTimes,
4
+ } from '@newskit-render/my-account'
5
+ import { publisher } from '../config'
6
+
7
+ export const getProviderPropsUtil = (context, options?) => {
8
+ if (process.env.NODE_ENV === 'development' && publisher === 'TIMES') {
9
+ return getProviderPropsTimes(context, {
10
+ ...options,
11
+ })
12
+ }
13
+
14
+ return getProviderProps(context, {
15
+ ...options,
16
+ })
17
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@newskit-render/core",
3
- "version": "0.0.0-e16014a0",
3
+ "version": "0.0.0-e32035419",
4
4
  "description": "Newskit Render - Core package",
5
5
  "author": "",
6
6
  "license": "UNLICENSED",
@@ -42,15 +42,15 @@
42
42
  "@emotion/styled": "11.9.3",
43
43
  "@newrelic/next": "0.5.2",
44
44
  "@newrelic/winston-enricher": "4.0.1",
45
- "@newskit-render/api": "^1.12.1",
46
- "@newskit-render/auth": "^1.8.0",
47
- "@newskit-render/checkout": "^3.9.34",
48
- "@newskit-render/feature-flags": "^1.8.1",
49
- "@newskit-render/feed": "^1.8.9",
50
- "@newskit-render/my-account": "^7.54.0",
51
- "@newskit-render/shared-components": "^4.28.0",
52
- "@newskit-render/standalone-components": "^3.20.27",
53
- "@newskit-render/validation": "^1.17.0",
45
+ "@newskit-render/api": "^1.14.0",
46
+ "@newskit-render/auth": "^1.8.1",
47
+ "@newskit-render/checkout": "^3.10.18",
48
+ "@newskit-render/feature-flags": "^1.10.0",
49
+ "@newskit-render/feed": "^1.8.13",
50
+ "@newskit-render/my-account": "^7.75.1",
51
+ "@newskit-render/shared-components": "^4.33.1",
52
+ "@newskit-render/standalone-components": "^3.23.1",
53
+ "@newskit-render/validation": "^1.18.0",
54
54
  "cross-fetch": "3.1.5",
55
55
  "graphql": "16.6.0",
56
56
  "lodash.get": "4.4.2",
@@ -3,6 +3,8 @@ import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
3
3
  import { AddField, addComponentMap } from '@newskit-render/my-account'
4
4
  import validation from '../../../validation'
5
5
  import { DynamicPage } from '@newskit-render/my-account'
6
+ import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
7
+ import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
6
8
 
7
9
  const AccountAddField = (props) => (
8
10
  <DynamicPage
@@ -28,7 +30,14 @@ export const getServerSideProps = async (context) => {
28
30
  console.error(`An error ${context.res.statusCode} occurred on server`)
29
31
  }
30
32
 
31
- return {
32
- props: { data: { type: field } },
33
+ const featureFlags = await getAllFeatureFlags()
34
+ const providerProps = (await getProviderPropsUtil(
35
+ { ...context, provider: 'AddField' },
36
+ { featureFlags } /* cra-effected */
37
+ )) as unknown as { props: { data: { type: string } } }
38
+
39
+ if (providerProps?.props) {
40
+ providerProps.props = { ...providerProps.props, data: { type: field } }
33
41
  }
42
+ return providerProps
34
43
  }
@@ -1,8 +1,9 @@
1
1
  import React from 'react'
2
- import { Cancellation, getProviderProps } from '@newskit-render/my-account'
2
+ import { Cancellation } from '@newskit-render/my-account'
3
3
  import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
4
- import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
4
+ import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
5
5
  import validation from '../../../validation'
6
+ import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
6
7
 
7
8
  const AccountCancellation = (props) => (
8
9
  <Cancellation {...props} validation={validation} />
@@ -13,9 +14,9 @@ export default AccountCancellation
13
14
  export const getServerSideProps = async (context) => {
14
15
  replaceConsoleAndSetTransactionName('Account: Cancellation')
15
16
  /* start cra-effected */
16
- const featureFlags = await getFlagsAll()
17
+ const featureFlags = await getAllFeatureFlags()
17
18
  /* end cra-effected */
18
- return getProviderProps(
19
+ return getProviderPropsUtil(
19
20
  { ...context, provider: 'Cancellation' },
20
21
  { featureFlags } /* cra-effected */
21
22
  )
@@ -1,9 +1,7 @@
1
1
  import React from 'react'
2
- import {
3
- ConfirmAccountDeletion,
4
- getProviderProps,
5
- } from '@newskit-render/my-account'
2
+ import { ConfirmAccountDeletion } from '@newskit-render/my-account'
6
3
  import { replaceConsoleAndSetTransactionName } from '../../../../helpers/logger'
4
+ import { getProviderPropsUtil } from '../../../../helpers/getProviderPropsUtil'
7
5
 
8
6
  const ConfirmDeletion = (props) => <ConfirmAccountDeletion {...props} />
9
7
 
@@ -12,5 +10,5 @@ export default ConfirmDeletion
12
10
  export const getServerSideProps = async (context) => {
13
11
  replaceConsoleAndSetTransactionName('Account: Deletion - Confirmation')
14
12
 
15
- return getProviderProps({ ...context })
13
+ return getProviderPropsUtil({ ...context })
16
14
  }
@@ -1,9 +1,7 @@
1
1
  import React from 'react'
2
- import {
3
- AccountDeletionError,
4
- getProviderProps,
5
- } from '@newskit-render/my-account'
2
+ import { AccountDeletionError } from '@newskit-render/my-account'
6
3
  import { replaceConsoleAndSetTransactionName } from '../../../../helpers/logger'
4
+ import { getProviderPropsUtil } from '../../../../helpers/getProviderPropsUtil'
7
5
 
8
6
  const Error = (props) => <AccountDeletionError {...props} />
9
7
 
@@ -12,5 +10,5 @@ export default Error
12
10
  export const getServerSideProps = async (context) => {
13
11
  replaceConsoleAndSetTransactionName('Account: Deletion - Error')
14
12
 
15
- return getProviderProps({ ...context })
13
+ return getProviderPropsUtil({ ...context })
16
14
  }
@@ -1,9 +1,7 @@
1
1
  import React from 'react'
2
- import {
3
- InitiateAccountDeletion,
4
- getProviderProps,
5
- } from '@newskit-render/my-account'
2
+ import { InitiateAccountDeletion } from '@newskit-render/my-account'
6
3
  import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
4
+ import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
7
5
 
8
6
  const AccountDeletion = (props) => <InitiateAccountDeletion {...props} />
9
7
 
@@ -12,5 +10,5 @@ export default AccountDeletion
12
10
  export const getServerSideProps = async (context) => {
13
11
  replaceConsoleAndSetTransactionName('Account: Deletion')
14
12
 
15
- return getProviderProps({ ...context })
13
+ return getProviderPropsUtil({ ...context })
16
14
  }
@@ -1,9 +1,7 @@
1
1
  import React from 'react'
2
- import {
3
- AccountDeletionSuccess,
4
- getProviderProps,
5
- } from '@newskit-render/my-account'
2
+ import { AccountDeletionSuccess } from '@newskit-render/my-account'
6
3
  import { replaceConsoleAndSetTransactionName } from '../../../../helpers/logger'
4
+ import { getProviderPropsUtil } from '../../../../helpers/getProviderPropsUtil'
7
5
 
8
6
  const Success = (props) => <AccountDeletionSuccess {...props} />
9
7
 
@@ -12,5 +10,5 @@ export default Success
12
10
  export const getServerSideProps = async (context) => {
13
11
  replaceConsoleAndSetTransactionName('Account: Deletion - Success')
14
12
 
15
- return getProviderProps({ ...context })
13
+ return getProviderPropsUtil({ ...context })
16
14
  }
@@ -1,7 +1,8 @@
1
1
  import React from 'react'
2
- import { DreamTeam, getProviderProps } from '@newskit-render/my-account'
2
+ import { DreamTeam } from '@newskit-render/my-account'
3
3
  import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
4
- import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
4
+ import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
5
+ import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
5
6
 
6
7
  const AccountNewslettersAndAlerts = (props) => <DreamTeam {...props} />
7
8
 
@@ -10,9 +11,9 @@ export default AccountNewslettersAndAlerts
10
11
  export const getServerSideProps = async (context) => {
11
12
  replaceConsoleAndSetTransactionName('Account: Dream Team')
12
13
  /* start cra-effected */
13
- const featureFlags = await getFlagsAll()
14
+ const featureFlags = await getAllFeatureFlags()
14
15
  /* end cra-effected */
15
- return getProviderProps(
16
+ return getProviderPropsUtil(
16
17
  { ...context, provider: 'DreamTeam' },
17
18
  { featureFlags } /* cra-effected */
18
19
  )
@@ -2,12 +2,12 @@ import React from 'react'
2
2
  import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
3
3
  import {
4
4
  EditField,
5
- getProviderProps,
6
5
  editComponentMap,
7
6
  DynamicPage,
8
7
  } from '@newskit-render/my-account'
9
- import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
8
+ import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
10
9
  import validation from '../../../validation'
10
+ import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
11
11
 
12
12
  const AccountEditField = (props) => (
13
13
  <DynamicPage
@@ -35,10 +35,10 @@ export const getServerSideProps = async (context) => {
35
35
  console.error(`An error ${context.res.statusCode} occurred on server`)
36
36
  }
37
37
  /* start cra-effected */
38
- const featureFlags = await getFlagsAll()
38
+ const featureFlags = await getAllFeatureFlags()
39
39
  /* end cra-effected */
40
40
 
41
- return getProviderProps(
41
+ return getProviderPropsUtil(
42
42
  { ...context, provider: 'EditField' },
43
43
  { featureFlags } /* cra-effected */
44
44
  )
@@ -1,7 +1,8 @@
1
1
  import React from 'react'
2
- import { Family, getProviderProps } from '@newskit-render/my-account'
2
+ import { Family } from '@newskit-render/my-account'
3
3
  import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
4
- import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
4
+ import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
5
+ import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
5
6
 
6
7
  const AccountFamily = (props) => <Family {...props} />
7
8
 
@@ -10,10 +11,13 @@ export default AccountFamily
10
11
  export const getServerSideProps = async (context) => {
11
12
  replaceConsoleAndSetTransactionName('Account: Family')
12
13
  /* start cra-effected */
13
- const featureFlags = await getFlagsAll()
14
+ const featureFlags = await getAllFeatureFlags()
14
15
  /* end cra-effected */
15
- return getProviderProps(
16
- { ...context, provider: 'GroupAccounts' },
16
+ return getProviderPropsUtil(
17
+ {
18
+ ...context,
19
+ provider: 'GroupAccounts',
20
+ },
17
21
  { featureFlags } /* cra-effected */
18
22
  )
19
23
  }
@@ -1,7 +1,8 @@
1
1
  import React from 'react'
2
- import { getProviderProps, HolidayStop } from '@newskit-render/my-account'
2
+ import { HolidayStop } from '@newskit-render/my-account'
3
3
  import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
4
- import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
4
+ import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
5
+ import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
5
6
 
6
7
  const AccountHolidayStop = (props) => <HolidayStop {...props} />
7
8
 
@@ -10,9 +11,9 @@ export default AccountHolidayStop
10
11
  export const getServerSideProps = async (context) => {
11
12
  replaceConsoleAndSetTransactionName('Account: Book a Holiday Stop')
12
13
  /* start cra-effected */
13
- const featureFlags = await getFlagsAll()
14
+ const featureFlags = await getAllFeatureFlags()
14
15
  /* end cra-effected */
15
- return getProviderProps(
16
+ return getProviderPropsUtil(
16
17
  { ...context, provider: 'HolidayStop' },
17
18
  { featureFlags } /* cra-effected */
18
19
  )
@@ -1,7 +1,8 @@
1
1
  import React from 'react'
2
- import { getProviderProps, HolidayStopList } from '@newskit-render/my-account'
2
+ import { HolidayStopList } from '@newskit-render/my-account'
3
3
  import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
4
4
  import { holidayStopListContextOverrides } from '../../../context/app-context/holidayStopListContextOverrides'
5
+ import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
5
6
 
6
7
  const AccountPreviousHolidayStops = (props) => (
7
8
  <HolidayStopList
@@ -15,5 +16,5 @@ export default AccountPreviousHolidayStops
15
16
 
16
17
  export const getServerSideProps = async (context) => {
17
18
  replaceConsoleAndSetTransactionName('Account: Previous Holiday Stops')
18
- return getProviderProps({ ...context, provider: 'HolidayStop' })
19
+ return getProviderPropsUtil({ ...context, provider: 'HolidayStop' })
19
20
  }
@@ -1,7 +1,8 @@
1
1
  import React from 'react'
2
- import { getProviderProps, HolidayStopList } from '@newskit-render/my-account'
2
+ import { HolidayStopList } from '@newskit-render/my-account'
3
3
  import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
4
4
  import { holidayStopListContextOverrides } from '../../../context/app-context/holidayStopListContextOverrides'
5
+ import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
5
6
 
6
7
  const AccountUpcomingHolidayStops = (props) => (
7
8
  <HolidayStopList
@@ -15,5 +16,5 @@ export default AccountUpcomingHolidayStops
15
16
 
16
17
  export const getServerSideProps = async (context) => {
17
18
  replaceConsoleAndSetTransactionName('Account: Upcoming Holiday Stops')
18
- return getProviderProps({ ...context, provider: 'HolidayStop' })
19
+ return getProviderPropsUtil({ ...context, provider: 'HolidayStop' })
19
20
  }
@@ -1,9 +1,9 @@
1
1
  import React from 'react'
2
- import { PersonalDetails, getProviderProps } from '@newskit-render/my-account'
3
- import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
2
+ import { PersonalDetails } from '@newskit-render/my-account'
3
+ import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
4
4
  import { AccountDropdown } from '../../components/AccountDropdown' /* cra-disabled */
5
5
  import { replaceConsoleAndSetTransactionName } from '../../helpers/logger'
6
- import { closeFlagsInstance } from '@newskit-render/feature-flags'
6
+ import { getProviderPropsUtil } from '../../helpers/getProviderPropsUtil'
7
7
 
8
8
  const AccountPersonalDetails = (props) => {
9
9
  return (
@@ -23,10 +23,9 @@ export default AccountPersonalDetails
23
23
  export const getServerSideProps = async (context) => {
24
24
  replaceConsoleAndSetTransactionName('Account: Personal details')
25
25
 
26
- const featureFlags = await getFlagsAll()
27
- await closeFlagsInstance()
26
+ const featureFlags = await getAllFeatureFlags()
28
27
 
29
- return getProviderProps(
28
+ return getProviderPropsUtil(
30
29
  { ...context, provider: 'PersonalDetails' },
31
30
  { featureFlags } /* cra-effected */
32
31
  )
@@ -1,7 +1,8 @@
1
1
  import React from 'react'
2
- import { Newsletters, getProviderProps } from '@newskit-render/my-account'
2
+ import { Newsletters } from '@newskit-render/my-account'
3
3
  import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
4
- import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
4
+ import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
5
+ import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
5
6
 
6
7
  const AccountNewsletters = (props) => <Newsletters {...props} />
7
8
 
@@ -10,9 +11,9 @@ export default AccountNewsletters
10
11
  export const getServerSideProps = async (context) => {
11
12
  replaceConsoleAndSetTransactionName('Account: Newsletters')
12
13
  /* start cra-effected */
13
- const featureFlags = await getFlagsAll()
14
+ const featureFlags = await getAllFeatureFlags()
14
15
  /* end cra-effected */
15
- return getProviderProps(
16
+ return getProviderPropsUtil(
16
17
  { ...context, provider: 'Newsletters' },
17
18
  { featureFlags } /* cra-effected */
18
19
  )
@@ -1,10 +1,8 @@
1
1
  import React from 'react'
2
- import {
3
- NewslettersAndAlerts,
4
- getProviderProps,
5
- } from '@newskit-render/my-account'
2
+ import { NewslettersAndAlerts } from '@newskit-render/my-account'
6
3
  import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
7
- import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
4
+ import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
5
+ import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
8
6
 
9
7
  const AccountNewslettersAndAlerts = (props) => (
10
8
  <NewslettersAndAlerts {...props} />
@@ -15,9 +13,9 @@ export default AccountNewslettersAndAlerts
15
13
  export const getServerSideProps = async (context) => {
16
14
  replaceConsoleAndSetTransactionName('Account: Newsletters and Alerts')
17
15
  /* start cra-effected */
18
- const featureFlags = await getFlagsAll()
16
+ const featureFlags = await getAllFeatureFlags()
19
17
  /* end cra-effected */
20
- return getProviderProps(
18
+ return getProviderPropsUtil(
21
19
  { ...context, provider: 'NewslettersAndAlerts' },
22
20
  { featureFlags } /* cra-effected */
23
21
  )
@@ -1,12 +1,12 @@
1
1
  import React from 'react'
2
2
  import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
3
3
  import {
4
- getProviderProps,
5
4
  Payment,
6
5
  paymentMethodsMap,
7
6
  DynamicPage,
8
7
  } from '@newskit-render/my-account'
9
- import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
8
+ import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
9
+ import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
10
10
 
11
11
  const PaymentPage = (props) => {
12
12
  return (
@@ -24,10 +24,10 @@ export default PaymentPage
24
24
  export const getServerSideProps = async (context) => {
25
25
  replaceConsoleAndSetTransactionName('Payment method')
26
26
  /* start cra-effected */
27
- const featureFlags = await getFlagsAll()
27
+ const featureFlags = await getAllFeatureFlags()
28
28
  /* end cra-effected */
29
29
 
30
- return getProviderProps(
30
+ return getProviderPropsUtil(
31
31
  {
32
32
  ...context,
33
33
  provider: 'Payment',
@@ -1,7 +1,8 @@
1
1
  import React from 'react'
2
2
  import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
3
- import { Payment, getProviderProps } from '@newskit-render/my-account'
4
- import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
3
+ import { Payment } from '@newskit-render/my-account'
4
+ import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
5
+ import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
5
6
 
6
7
  const AccountPayment = (props) => <Payment {...props} />
7
8
 
@@ -10,10 +11,10 @@ export default AccountPayment
10
11
  export const getServerSideProps = async (context) => {
11
12
  replaceConsoleAndSetTransactionName('Edit Payment method')
12
13
  /* start cra-effected */
13
- const featureFlags = await getFlagsAll()
14
+ const featureFlags = await getAllFeatureFlags()
14
15
  /* end cra-effected */
15
16
 
16
- return getProviderProps(
17
+ return getProviderPropsUtil(
17
18
  {
18
19
  ...context,
19
20
  provider: 'Payment',
@@ -1,8 +1,9 @@
1
1
  import React from 'react'
2
- import { getProviderProps, PaymentMethods } from '@newskit-render/my-account'
3
- import { getFlagsAll } from '@newskit-render/feature-flags' // create-render-app effected
2
+ import { PaymentMethods } from '@newskit-render/my-account'
3
+ import { getAllFeatureFlags } from '@newskit-render/feature-flags' // create-render-app effected
4
4
  import { paymentMethodContext } from '../../../context/app-context/paymentMethodContext'
5
5
  import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
6
+ import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
6
7
 
7
8
  const AccountPaymentMethods = (props) => (
8
9
  <PaymentMethods {...props} context={paymentMethodContext} />
@@ -12,9 +13,9 @@ export default AccountPaymentMethods
12
13
 
13
14
  export const getServerSideProps = async (context) => {
14
15
  replaceConsoleAndSetTransactionName('Account: Payment Methods')
15
- const featureFlags = await getFlagsAll()
16
+ const featureFlags = await getAllFeatureFlags()
16
17
  // create-render-app effected
17
- return getProviderProps(
18
+ return getProviderPropsUtil(
18
19
  { ...context, provider: 'PaymentMethods' },
19
20
  { featureFlags } // create-render-app effected
20
21
  )
@@ -1,10 +1,8 @@
1
1
  import React from 'react'
2
- import {
3
- SubscriptionAndBilling,
4
- getProviderProps,
5
- } from '@newskit-render/my-account'
6
- import { getFlagsAll } from '@newskit-render/feature-flags' /* cra-effected */
2
+ import { SubscriptionAndBilling } from '@newskit-render/my-account'
3
+ import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
7
4
  import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
5
+ import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
8
6
 
9
7
  const AccountSubscriptionAndBilling = (props) => (
10
8
  <SubscriptionAndBilling {...props} />
@@ -15,9 +13,9 @@ export default AccountSubscriptionAndBilling
15
13
  export const getServerSideProps = async (context) => {
16
14
  replaceConsoleAndSetTransactionName('Account: Subscription and Billing')
17
15
  /* start cra-effected */
18
- const featureFlags = await getFlagsAll()
16
+ const featureFlags = await getAllFeatureFlags()
19
17
  /* end cra-effected */
20
- const result = await getProviderProps(
18
+ const result = await getProviderPropsUtil(
21
19
  {
22
20
  ...context,
23
21
  provider: 'SubscriptionAndBilling',
@@ -0,0 +1,20 @@
1
+ import React from 'react'
2
+ import { UserHub as UserHubPage } from '@newskit-render/my-account'
3
+ import { replaceConsoleAndSetTransactionName } from '../../../helpers/logger'
4
+ import { getAllFeatureFlags } from '@newskit-render/feature-flags' /* cra-effected */
5
+ import { getProviderPropsUtil } from '../../../helpers/getProviderPropsUtil'
6
+
7
+ const UserHub = (props) => <UserHubPage {...props} />
8
+
9
+ export default UserHub
10
+
11
+ export const getServerSideProps = async (context) => {
12
+ replaceConsoleAndSetTransactionName('Account: UserHub')
13
+ /* start cra-effected */
14
+ const featureFlags = await getAllFeatureFlags()
15
+ /* end cra-effected */
16
+ return getProviderPropsUtil(
17
+ { ...context, provider: 'PersonalDetails' },
18
+ { featureFlags } /* cra-effected */
19
+ )
20
+ }