Skip to content

Commit

Permalink
Merge branch 'staging' into OCD-4770
Browse files Browse the repository at this point in the history
  • Loading branch information
andlar committed Mar 4, 2025
2 parents 2c165b2 + d3b5cda commit 7e6de61
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 1 deletion.
12 changes: 12 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Release Notes

## Version 13.33.0
_3 March 2025_

### Features
* Create shortcut page for Decision Support Interventions
* Enable add/edit of surveillance in new UI

### Bug Fixes
* Restore "Surveillance Activity" download feature

---

## Version 13.32.2
_18 February 2025_

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chpl",
"version": "13.32.2",
"version": "13.33.0",
"license": "SEE LICENSE IN LICENSE",
"repository": "chpladmin/chpl-website",
"scripts": {
Expand Down
14 changes: 14 additions & 0 deletions src/app/components/listing/listing-edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ import { getDisplayDateFormat } from 'services/date-util';
import { ListingContext, UserContext } from 'shared/contexts';

const validationSchema = yup.object({
acbCertificationId: yup.string()
.max(250, 'ONC-ACB Certification Id must be 250 characters or less'),
certifyingBody: yup.string()
.required('ONC-ACB is required'),
productCode: yup.string()
Expand Down Expand Up @@ -180,6 +182,7 @@ function ChplListingEdit({
payload: {
listing: {
...listing,
acbCertificationId: formik.values.acbCertificationId,
certificationEvents: selectedStatuses,
certifyingBody: acbs.find((acb) => acb.name === formik.values.certifyingBody),
testingLabs: selectedAtls.map((atl) => ({ testingLab: atl })),
Expand All @@ -198,6 +201,7 @@ function ChplListingEdit({

formik = useFormik({
initialValues: {
acbCertificationId: listing.acbCertificationId ?? '',
certifyingBody: listing.certifyingBody.name ?? '',
productCode: listing.chplProductNumber.split('.')[4],
versionCode: listing.chplProductNumber.split('.')[5],
Expand Down Expand Up @@ -422,6 +426,16 @@ function ChplListingEdit({
&& (
<Typography>{listing.certifyingBody.name}</Typography>
)}
<ChplTextField
id="acb-certification-id"
name="acbCertificationId"
label="ONC-ACB Certification Id"
value={formik.values.acbCertificationId}
onChange={formik.handleChange}
onBlur={formik.handleBlur}
error={formik.touched.acbCertificationId && !!formik.errors.acbCertificationId}
helperText={formik.touched.acbCertificationId && formik.errors.acbCertificationId}
/>
</Box>
<Divider />
<Box pt={4} display="flex" gridGap={8} flexDirection="column">
Expand Down

0 comments on commit 7e6de61

Please sign in to comment.