Skip to content

Commit

Permalink
Make the showing/hiding reference number field configurable
Browse files Browse the repository at this point in the history
  • Loading branch information
vasharma05 committed Jan 10, 2025
1 parent 583aa07 commit 6b0f786
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 29 deletions.
7 changes: 7 additions & 0 deletions packages/esm-patient-orders-app/src/config-schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ export const configSchema = {
},
},
},
showReferenceNumberField: {
_type: Type.Boolean,
_default: true,
_description:
'Whether to display the Reference number field in the Order form. This field maps to the accesion_number property in the Order data model',
},
};

export interface OrderTypeDefinition {
Expand All @@ -54,4 +60,5 @@ export interface ConfigObject {
orderEncounterType: string;
showPrintButton: boolean;
orderTypes: Array<OrderTypeDefinition>;
showReferenceNumberField: boolean;
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export function OrderForm({
const { orders, setOrders } = useOrderBasket<OrderBasketItem>(orderTypeUuid, prepOrderPostData);
const [showErrorNotification, setShowErrorNotification] = useState(false);
const { orderType } = useOrderType(orderTypeUuid);
const config = useConfig<ConfigObject>();

const OrderFormSchema = useMemo(
() =>
Expand Down Expand Up @@ -156,31 +157,33 @@ export function OrderForm({
</InputWrapper>
</Column>
</Grid>
<Grid className={styles.gridRow}>
<Column lg={16} md={8} sm={4}>
<InputWrapper>
<Controller
name="accessionNumber"
control={control}
render={({ field: { onChange, onBlur, value } }) => (
<TextInput
id="labReferenceNumberInput"
invalid={!!errors.accessionNumber}
invalidText={errors.accessionNumber?.message}
labelText={t('referenceNumber', 'Reference number', {
orderType: orderType?.display,
})}
maxLength={150}
onBlur={onBlur}
onChange={onChange}
size={responsiveSize}
value={value}
/>
)}
/>
</InputWrapper>
</Column>
</Grid>
{config.showReferenceNumberField && (
<Grid className={styles.gridRow}>
<Column lg={16} md={8} sm={4}>
<InputWrapper>
<Controller
name="accessionNumber"
control={control}
render={({ field: { onChange, onBlur, value } }) => (
<TextInput
id="labReferenceNumberInput"
invalid={!!errors.accessionNumber}
invalidText={errors.accessionNumber?.message}
labelText={t('referenceNumber', 'Reference number', {
orderType: orderType?.display,
})}
maxLength={150}
onBlur={onBlur}
onChange={onChange}
size={responsiveSize}
value={value}
/>
)}
/>
</InputWrapper>
</Column>
</Grid>
)}
<Grid className={styles.gridRow}>
<Column lg={8} md={8} sm={4}>
<InputWrapper>
Expand Down
6 changes: 3 additions & 3 deletions packages/esm-patient-tests-app/src/config-schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ export const configSchema = {
_default: ['1748a953-d12e-4be1-914c-f6b096c6cdef'],
},
},
showLabReferenceNumberField: {
showReferenceNumberField: {
_type: Type.Boolean,
_default: true,
_description:
'Whether to display the Lab Reference number field in the Lab Order form. This field maps to the accesion_number property in the Order data model',
'Whether to display the Reference number field in the Test Order form. This field maps to the accesion_number property in the Order data model',
},
additionalTestOrderTypes: {
_type: Type.Array,
Expand Down Expand Up @@ -130,7 +130,7 @@ export interface ConfigObject {
labOrderTypeUuid: string;
labOrderableConcepts: Array<string>;
};
showLabReferenceNumberField: boolean;
showReferenceNumberField: boolean;
additionalTestOrderTypes: Array<{
label?: string;
orderTypeUuid: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ export function LabOrderForm({
</InputWrapper>
</Column>
</Grid>
{config.showLabReferenceNumberField ? (
{config.showReferenceNumberField ? (
<Grid className={styles.gridRow}>
<Column lg={16} md={8} sm={4}>
<InputWrapper>
Expand Down

0 comments on commit 6b0f786

Please sign in to comment.