Skip to content

Commit 3c1457b

Browse files
committed
changes discussed with Adam
1 parent 634be98 commit 3c1457b

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

app/src/components/blocks/_admin/reviewDetailsPage/ReviewDetailsPage.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,15 @@ const ReviewsDetailsPage = ({ reviewSnoMed }: ReviewsDetailsPageProps): JSX.Elem
183183
</PatientSummary>
184184
</div>
185185

186-
{!session.isFullscreen ? (
186+
{session.isFullscreen ? (
187+
<RecordCard
188+
heading={getConfigForDocType(reviewSnoMed).displayName}
189+
fullScreenHandler={setFullScreen}
190+
detailsElement={<RecordLoader {...recordDetailsProps} />}
191+
isFullScreen={session.isFullscreen!}
192+
pdfObjectUrl={hasRecordInStorage ? pdfObjectUrl : ''}
193+
/>
194+
) : (
187195
<div className="lloydgeorge_record-stage_flex">
188196
<div
189197
className={`lloydgeorge_record-stage_flex-row lloydgeorge_record-stage_flex-row${menuClass}`}
@@ -202,14 +210,6 @@ const ReviewsDetailsPage = ({ reviewSnoMed }: ReviewsDetailsPageProps): JSX.Elem
202210
/>
203211
</div>
204212
</div>
205-
) : (
206-
<RecordCard
207-
heading={getConfigForDocType(reviewSnoMed).displayName}
208-
fullScreenHandler={setFullScreen}
209-
detailsElement={<RecordLoader {...recordDetailsProps} />}
210-
isFullScreen={session.isFullscreen!}
211-
pdfObjectUrl={hasRecordInStorage ? pdfObjectUrl : ''}
212-
/>
213213
)}
214214

215215
<section aria-labelledby="accepting-document" className="pb-6 accepting-document pt-6">

app/src/components/blocks/_admin/reviewDetailsPatientSearchPage/ReviewDetailsPatientSearchPage.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import BackButton from '../../../generic/backButton/BackButton';
2323
import SpinnerButton from '../../../generic/spinnerButton/SpinnerButton';
2424
import ErrorBox from '../../../layout/errorBox/ErrorBox';
2525
import ServiceError from '../../../layout/serviceErrorBox/ServiceErrorBox';
26+
import { NHS_NUMBER_PATTERN } from '../../../../helpers/constants/regex';
2627

2728
export const incorrectFormatMessage = "Enter patient's 10 digit NHS number";
2829

@@ -51,7 +52,7 @@ const ReviewDetailsPatientSearchPage = ({
5152
const { ref: nhsNumberRef, ...searchProps } = register('nhsNumber', {
5253
required: incorrectFormatMessage,
5354
pattern: {
54-
value: /^\s*([0-9]{10}|[0-9]{3}\s[0-9]{3}\s[0-9]{4}|[0-9]{3}-[0-9]{3}-[0-9]{4})\s*$/,
55+
value: NHS_NUMBER_PATTERN,
5556
message: incorrectFormatMessage,
5657
},
5758
});
@@ -97,7 +98,7 @@ const ReviewDetailsPatientSearchPage = ({
9798
if (error && error.response?.status === 404) {
9899
const errorData = error.response?.data as { err_code: string };
99100
setInputError(
100-
errorCodes![errorData?.err_code!] ?? 'Sorry, patient data not found.',
101+
errorCodes[errorData?.err_code] ?? 'Sorry, patient data not found.',
101102
);
102103
} else {
103104
setInputError(errorMessage);

app/src/components/blocks/_admin/reviewsPage/ReviewsPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export const ReviewsPage = ({ setSnoMed: setReviewType }: ReviewsPageProps): JSX
6262
return newTokens;
6363
});
6464
}
65-
} catch (error) {
65+
} catch {
6666
setFailedLoading(true);
6767
setCurrentPage(1);
6868
setPageTokens(['']);

app/src/helpers/constants/regex.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export const NHS_NUMBER_PATTERN =
2+
/^\s*(\d{10}|\d{3}\s\d{3}\s\d{4}|\d{3}-\d{3}-\d{4})\s*$/;

0 commit comments

Comments
 (0)