Skip to content

Commit 7c6be43

Browse files
VIA-629 SB Make nbsPath optional, since we don't know it for most vaccines.
1 parent 46b6943 commit 7c6be43

File tree

3 files changed

+7
-36
lines changed

3 files changed

+7
-36
lines changed

src/app/_components/nbs/NBSBookingAction.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const NBSBookingActionForVaccine = ({
3838
renderAs,
3939
reduceBottomPadding = false,
4040
}: NBSBookingActionForVaccineProps): JSX.Element => {
41-
const vaccinePath: UrlPathFragment = VaccineInfo[vaccineType].nbsPath;
41+
const vaccinePath: UrlPathFragment = VaccineInfo[vaccineType].nbsPath || ("unknown" as UrlPathFragment);
4242
const nbsSSOLink = `${SSO_TO_NBS_ROUTE}?vaccine=${vaccinePath}`;
4343

4444
return (

src/models/vaccine.ts

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ export type VaccineDetails = {
4040
removeHowToGetExpanderFromMoreInformationSection?: boolean;
4141
contentPath: UrlPathFragment;
4242
cacheFilename: Filename;
43-
nbsPath: UrlPathFragment;
44-
nbsCampaign: NbsCampaign;
43+
nbsPath?: UrlPathFragment;
44+
nbsCampaign?: NbsCampaign;
4545
supressWarningCallout?: boolean;
4646
moreInformationHeadersFromContentApi?: boolean;
4747
};
@@ -112,8 +112,6 @@ const VaccineInfo: Record<VaccineType, VaccineDetails> = {
112112
personalisedEligibilityStatusRequired: false,
113113
contentPath: "vaccinations/td-ipv-vaccine-3-in-1-teenage-booster" as UrlPathFragment,
114114
cacheFilename: "td-ipv-vaccine-3-in-1-teenage-booster.json" as Filename,
115-
nbsPath: "unknown" as UrlPathFragment,
116-
nbsCampaign: "unknown" as NbsCampaign,
117115
},
118116
[VaccineType.VACCINE_6_IN_1]: {
119117
urlPath: "6-in-1-vaccine" as UrlPathFragment,
@@ -130,8 +128,6 @@ const VaccineInfo: Record<VaccineType, VaccineDetails> = {
130128
personalisedEligibilityStatusRequired: false,
131129
contentPath: "vaccinations/6-in-1-vaccine" as UrlPathFragment,
132130
cacheFilename: "6-in-1-vaccine.json" as Filename,
133-
nbsPath: "unknown" as UrlPathFragment,
134-
nbsCampaign: "unknown" as NbsCampaign,
135131
},
136132
[VaccineType.ROTAVIRUS]: {
137133
urlPath: "rotavirus-vaccine" as UrlPathFragment,
@@ -148,8 +144,6 @@ const VaccineInfo: Record<VaccineType, VaccineDetails> = {
148144
personalisedEligibilityStatusRequired: false,
149145
contentPath: "vaccinations/rotavirus-vaccine" as UrlPathFragment,
150146
cacheFilename: "rotavirus-vaccine.json" as Filename,
151-
nbsPath: "unknown" as UrlPathFragment,
152-
nbsCampaign: "unknown" as NbsCampaign,
153147
},
154148
[VaccineType.HPV]: {
155149
urlPath: "hpv-vaccine" as UrlPathFragment,
@@ -166,8 +160,6 @@ const VaccineInfo: Record<VaccineType, VaccineDetails> = {
166160
personalisedEligibilityStatusRequired: false,
167161
contentPath: "vaccinations/hpv-vaccine" as UrlPathFragment,
168162
cacheFilename: "hpv-vaccine.json" as Filename,
169-
nbsPath: "unknown" as UrlPathFragment,
170-
nbsCampaign: "unknown" as NbsCampaign,
171163
supressWarningCallout: true,
172164
},
173165
[VaccineType.MENB_CHILDREN]: {
@@ -185,8 +177,6 @@ const VaccineInfo: Record<VaccineType, VaccineDetails> = {
185177
personalisedEligibilityStatusRequired: false,
186178
contentPath: "vaccinations/menb-vaccine-for-children" as UrlPathFragment,
187179
cacheFilename: "menb-vaccine-for-children.json" as Filename,
188-
nbsPath: "unknown" as UrlPathFragment,
189-
nbsCampaign: "unknown" as NbsCampaign,
190180
},
191181
[VaccineType.MMR]: {
192182
urlPath: "mmr-vaccine" as UrlPathFragment,
@@ -203,8 +193,6 @@ const VaccineInfo: Record<VaccineType, VaccineDetails> = {
203193
personalisedEligibilityStatusRequired: false,
204194
contentPath: "vaccinations/mmr-vaccine" as UrlPathFragment,
205195
cacheFilename: "mmr-vaccine.json" as Filename,
206-
nbsPath: "unknown" as UrlPathFragment,
207-
nbsCampaign: "unknown" as NbsCampaign,
208196
},
209197
[VaccineType.PNEUMOCOCCAL]: {
210198
urlPath: "pneumococcal-vaccine" as UrlPathFragment,
@@ -221,8 +209,6 @@ const VaccineInfo: Record<VaccineType, VaccineDetails> = {
221209
personalisedEligibilityStatusRequired: false,
222210
contentPath: "vaccinations/pneumococcal-vaccine" as UrlPathFragment,
223211
cacheFilename: "pneumococcal-vaccine.json" as Filename,
224-
nbsPath: "unknown" as UrlPathFragment,
225-
nbsCampaign: "unknown" as NbsCampaign,
226212
},
227213
[VaccineType.SHINGLES]: {
228214
urlPath: "shingles-vaccine" as UrlPathFragment,
@@ -239,9 +225,7 @@ const VaccineInfo: Record<VaccineType, VaccineDetails> = {
239225
personalisedEligibilityStatusRequired: false,
240226
contentPath: "vaccinations/shingles-vaccine" as UrlPathFragment,
241227
cacheFilename: "shingles-vaccine.json" as Filename,
242-
nbsPath: "unknown" as UrlPathFragment,
243228
supressWarningCallout: true,
244-
nbsCampaign: "unknown" as NbsCampaign,
245229
},
246230
[VaccineType.MENACWY]: {
247231
urlPath: "menacwy-vaccine" as UrlPathFragment,
@@ -258,8 +242,6 @@ const VaccineInfo: Record<VaccineType, VaccineDetails> = {
258242
personalisedEligibilityStatusRequired: false,
259243
contentPath: "vaccinations/menacwy-vaccine" as UrlPathFragment,
260244
cacheFilename: "menacwy-vaccine.json" as Filename,
261-
nbsPath: "unknown" as UrlPathFragment,
262-
nbsCampaign: "unknown" as NbsCampaign,
263245
supressWarningCallout: true,
264246
},
265247
[VaccineType.VACCINE_4_IN_1]: {
@@ -277,8 +259,6 @@ const VaccineInfo: Record<VaccineType, VaccineDetails> = {
277259
personalisedEligibilityStatusRequired: false,
278260
contentPath: "vaccinations/4-in-1-preschool-booster-vaccine" as UrlPathFragment,
279261
cacheFilename: "4-in-1-preschool-booster-vaccine.json" as Filename,
280-
nbsPath: "unknown" as UrlPathFragment,
281-
nbsCampaign: "unknown" as NbsCampaign,
282262
},
283263
[VaccineType.WHOOPING_COUGH]: {
284264
urlPath: "whooping-cough-vaccination" as UrlPathFragment,
@@ -298,8 +278,6 @@ const VaccineInfo: Record<VaccineType, VaccineDetails> = {
298278
personalisedEligibilityStatusRequired: false,
299279
contentPath: "pregnancy/keeping-well/whooping-cough-vaccination" as UrlPathFragment,
300280
cacheFilename: "whooping-cough-vaccination.json" as Filename,
301-
nbsPath: "unknown" as UrlPathFragment,
302-
nbsCampaign: "unknown" as NbsCampaign,
303281
},
304282
[VaccineType.HIB_MENC]: {
305283
urlPath: "hib-menc-vaccine" as UrlPathFragment,
@@ -316,8 +294,6 @@ const VaccineInfo: Record<VaccineType, VaccineDetails> = {
316294
personalisedEligibilityStatusRequired: false,
317295
contentPath: "vaccinations/hib-menc-vaccine" as UrlPathFragment,
318296
cacheFilename: "hib-menc-vaccine.json" as Filename,
319-
nbsPath: "unknown" as UrlPathFragment,
320-
nbsCampaign: "unknown" as NbsCampaign,
321297
},
322298
[VaccineType.FLU_IN_PREGNANCY]: {
323299
urlPath: "flu-vaccine-in-pregnancy" as UrlPathFragment,
@@ -335,8 +311,6 @@ const VaccineInfo: Record<VaccineType, VaccineDetails> = {
335311
personalisedEligibilityStatusRequired: false,
336312
contentPath: "pregnancy/keeping-well/flu-jab" as UrlPathFragment,
337313
cacheFilename: "flu-jab.json" as Filename,
338-
nbsPath: "unknown" as UrlPathFragment,
339-
nbsCampaign: "unknown" as NbsCampaign,
340314
moreInformationHeadersFromContentApi: true,
341315
},
342316
[VaccineType.COVID_19]: {
@@ -372,8 +346,6 @@ const VaccineInfo: Record<VaccineType, VaccineDetails> = {
372346
personalisedEligibilityStatusRequired: false,
373347
contentPath: "vaccinations/flu-vaccine" as UrlPathFragment,
374348
cacheFilename: "flu-vaccine.json" as Filename,
375-
nbsPath: "unknown" as UrlPathFragment,
376-
nbsCampaign: "unknown" as NbsCampaign,
377349
},
378350
[VaccineType.FLU_FOR_CHILDREN]: {
379351
urlPath: "flu-vaccine-for-children" as UrlPathFragment,
@@ -390,8 +362,6 @@ const VaccineInfo: Record<VaccineType, VaccineDetails> = {
390362
personalisedEligibilityStatusRequired: false,
391363
contentPath: "vaccinations/child-flu-vaccine" as UrlPathFragment,
392364
cacheFilename: "child-flu-vaccine.json" as Filename,
393-
nbsPath: "unknown" as UrlPathFragment,
394-
nbsCampaign: "unknown" as NbsCampaign,
395365
},
396366
[VaccineType.FLU_FOR_SCHOOL_AGED_CHILDREN]: {
397367
urlPath: "flu-vaccine-for-school-aged-children" as UrlPathFragment,
@@ -409,8 +379,6 @@ const VaccineInfo: Record<VaccineType, VaccineDetails> = {
409379
personalisedEligibilityStatusRequired: false,
410380
contentPath: "vaccinations/child-flu-vaccine" as UrlPathFragment,
411381
cacheFilename: "child-flu-vaccine.json" as Filename,
412-
nbsPath: "unknown" as UrlPathFragment,
413-
nbsCampaign: "unknown" as NbsCampaign,
414382
},
415383
};
416384

src/services/nbs/nbs-service.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ const getNbsQueryParams = async (vaccineType: VaccineType | undefined) => {
4646
const assertedLoginIdentityJWT = await generateAssertedLoginIdentityJwt();
4747

4848
return [
49-
{ name: NBS_QUERY_PARAMS.CAMPAIGN_ID, value: vaccineType ? VaccineInfo[vaccineType].nbsCampaign : "unknown" },
49+
{
50+
name: NBS_QUERY_PARAMS.CAMPAIGN_ID,
51+
value: vaccineType ? VaccineInfo[vaccineType].nbsCampaign || "unknown" : "unknown",
52+
},
5053
{ name: NBS_QUERY_PARAMS.ASSERTED_LOGIN_IDENTITY, value: assertedLoginIdentityJWT },
5154
];
5255
};

0 commit comments

Comments
 (0)