Skip to content

PRMP-1332 - single element are being placed in groups/lists #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jack-nhs merged 8 commits into from
Jan 3, 2025
Merged

PRMP-1332 - single element are being placed in groups/lists #482

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
56cd8b7
[PRMP-1332] Updated download and remove options to not be list items …
oliverbeumkes-nhs Dec 5, 2024
0d77822
moves update and delete links from within a list
JuttonS Dec 6, 2024
f1f65f1
removes fieldset from search for patient screen
JuttonS Dec 9, 2024
bf760f9
Merge branch 'PRMP-1332' of https://github.com/nhsconnect/national-do…
JuttonS Dec 9, 2024
4d50a11
remove unnessecary import
JuttonS Dec 9, 2024
ac945e8
Merge branch 'main' into PRMP-1332
oliverbeumkes-nhs Dec 17, 2024
84c17c6
[PRMP-1332] use css to create margin between link items
steph-torres-nhs Dec 20, 2024
aa73427
Merge branch 'main' into PRMP-1332
steph-torres-nhs Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions app/src/components/generic/recordMenuCard/RecordMenuCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ function RecordMenuCard({
setStage={setStage}
/>
)}
<br />
<br />
Copy link

@stephane-torres-madetech stephane-torres-madetech Dec 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could we CSS to create this space instead, margin-bottom 24px?

{downloadActions.length > 0 && (
<SideMenuSubSection
actionLinks={downloadActions}
Expand All @@ -61,13 +63,9 @@ const SideMenuSubSection = ({ actionLinks, heading, setStage }: SubSectionProps)
return (
<>
<h2 className="nhsuk-heading-m">{heading}</h2>
<ol>
{actionLinks.map((link) => (
<li key={link.key}>
<LinkItem link={link} setStage={setStage} />
</li>
))}
</ol>
{actionLinks.map((link) => (
<LinkItem key={link.key} link={link} setStage={setStage} />
))}
</>
);
};
Expand Down
49 changes: 23 additions & 26 deletions app/src/pages/patientSearchPage/PatientSearchPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useState } from 'react';
import { routes } from '../../types/generic/routes';
import { FieldValues, useForm } from 'react-hook-form';
import ErrorBox from '../../components/layout/errorBox/ErrorBox';
import { Button, Fieldset, Input } from 'nhsuk-react-components';
import { Button, Input } from 'nhsuk-react-components';
import SpinnerButton from '../../components/generic/spinnerButton/SpinnerButton';
import { InputRef } from '../../types/generic/inputRef';
import { useNavigate } from 'react-router-dom';
Expand Down Expand Up @@ -107,32 +107,29 @@ function PatientSearchPage() {
)}
</>
)}
<h1>{pageTitle}</h1>
<form onSubmit={handleSubmit(handleSearch, handleError)} noValidate>
<Fieldset>
<Fieldset.Legend headingLevel="h1" isPageHeading>
{pageTitle}
</Fieldset.Legend>
<Input
id="nhs-number-input"
data-testid="nhs-number-input"
label="Enter NHS number"
hint="A 10-digit number, for example, 485 777 3456"
type="text"
{...searchProps}
error={
submissionState !== SEARCH_STATES.SEARCHING && inputError
? inputError
: false
}
name="nhsNumber"
inputRef={nhsNumberRef as InputRef}
readOnly={
submissionState === SEARCH_STATES.SUCCEEDED ||
submissionState === SEARCH_STATES.SEARCHING
}
autoComplete="off"
/>
</Fieldset>
<Input
id="nhs-number-input"
data-testid="nhs-number-input"
label="Enter NHS number"
hint="A 10-digit number, for example, 485 777 3456"
type="text"
{...searchProps}
error={
submissionState !== SEARCH_STATES.SEARCHING && inputError
? inputError
: false
}
name="nhsNumber"
inputRef={nhsNumberRef as InputRef}
readOnly={
submissionState === SEARCH_STATES.SUCCEEDED ||
submissionState === SEARCH_STATES.SEARCHING
}
autoComplete="off"
/>

{submissionState === SEARCH_STATES.SEARCHING ? (
<SpinnerButton
id="patient-search-spinner"
Expand Down
Loading