@aehrc/smart-forms-renderer 0.35.1 → 0.35.3

package/lib/components/FormComponents/UrlItem/UrlItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"UrlItem.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/UrlItem/UrlItem.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"UrlItem.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/UrlItem/UrlItem.tsx"],"names":[],"mappings":"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"}

package/lib/utils/openChoice.js

@@ -100,11 +100,12 @@ export function getOpenChoiceControlType(qItem) {
  * @author Sean Fong
  */
 export function getAnswerOptionLabel(option) {
+    var _a;
     if (typeof option === 'string') {
         return option;
     }
     if (option['valueCoding']) {
-        return `${option.valueCoding.display}`;
+        return (_a = option.valueCoding.display) !== null && _a !== void 0 ? _a : `${option.valueCoding.code}`;
     }
     else if (option['valueString']) {
         return option.valueString;

package/lib/utils/openChoice.js.map

@@ -1 +1 @@
-{"version":3,"file":"openChoice.js","sourceRoot":"","sources":["../../src/utils/openChoice.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"openChoice.js","sourceRoot":"","sources":["../../src/utils/openChoice.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aehrc/smart-forms-renderer",
-  "version": "0.35.1",
+  "version": "0.35.3",
   "description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
   "main": "lib/index.js",
   "scripts": {

package/src/components/FormComponents/AttachmentItem/AttachmentField.tsx

@@ -50,12 +50,13 @@ function AttachmentField(props: AttachmentFieldProps) {
   return (
     <>
       <Stack rowGap={1}>
-        <Typography variant="subtitle2">
+        <Typography variant="subtitle2" color={readOnly ? 'text.disabled' : 'text.primary'}>
           An attachment must either have a file or a URL, or both.
         </Typography>
         <Box>
           <AttachmentFileCollector
             uploadedFile={uploadedFile}
+            readOnly={readOnly}
             isTabled={isTabled}
             onUploadFile={onUploadFile}
           />
@@ -70,7 +71,9 @@ function AttachmentField(props: AttachmentFieldProps) {
         />
 
         <Box>
-          <Typography variant="body2">File name (optional)</Typography>
+          <Typography variant="body2" color={readOnly ? 'text.disabled' : 'text.primary'}>
+            File name (optional)
+          </Typography>
           <StandardTextField
             fullWidth
             isTabled={isTabled}
@@ -84,7 +87,7 @@ function AttachmentField(props: AttachmentFieldProps) {
         </Box>
 
         {uploadedFile && url ? (
-          <Typography variant="subtitle2">
+          <Typography variant="subtitle2" color={readOnly ? 'text.disabled' : 'text.primary'}>
             Ensure that the attached file and URL has the same content.
           </Typography>
         ) : null}

package/src/components/FormComponents/AttachmentItem/AttachmentFileCollector.tsx

@@ -24,16 +24,21 @@ import type { PropsWithIsTabledAttribute } from '../../../interfaces/renderProps
 
 interface AttachmentFileCollectorProps extends PropsWithIsTabledAttribute {
   uploadedFile: File | null;
+  readOnly: boolean;
   onUploadFile: (file: File | null) => void;
 }
 
 const AttachmentFileCollector = memo(function AttachmentFileCollector(
   props: AttachmentFileCollectorProps
 ) {
-  const { uploadedFile, isTabled, onUploadFile } = props;
+  const { uploadedFile, readOnly, isTabled, onUploadFile } = props;
 
   const handleFileDrop = useCallback(
     (item: { files: any[] }) => {
+      if (readOnly) {
+        return;
+      }
+
       if (item) {
         const files = item.files;
 
@@ -61,12 +66,13 @@ const AttachmentFileCollector = memo(function AttachmentFileCollector(
         onDrop={handleFileDrop}
         file={uploadedFile}
         errorMessage={''}
+        readOnly={readOnly}
         isTabled={isTabled}
       />
       <Stack direction="row" justifyContent="space-between" pt={0.5}>
         <Box>
           <Tooltip title="Attach file">
-            <IconButton component="label" size="small">
+            <IconButton component="label" size="small" disabled={readOnly}>
               <Iconify icon="fluent:attach-24-regular" />
               <input type="file" hidden onChange={handleAttachFile} />
             </IconButton>
@@ -74,7 +80,7 @@ const AttachmentFileCollector = memo(function AttachmentFileCollector(
           <Tooltip title="Remove file">
             <span>
               <IconButton
-                disabled={!uploadedFile}
+                disabled={!uploadedFile || readOnly}
                 color="error"
                 size="small"
                 onClick={() => onUploadFile(null)}>

package/src/components/FormComponents/AttachmentItem/AttachmentFileDropBox.tsx

@@ -26,17 +26,20 @@ export interface AttachmentFileDropBoxProps extends PropsWithIsTabledAttribute {
   file: File | null;
   onDrop: (item: { files: any[] }) => void;
   errorMessage: string;
+  readOnly: boolean;
 }
 
 function AttachmentFileDropBox(props: AttachmentFileDropBoxProps) {
-  const { file, onDrop, errorMessage, isTabled } = props;
+  const { file, onDrop, errorMessage, readOnly, isTabled } = props;
 
   const { canDrop, isOver, dropTarget } = useFileDrop(onDrop);
 
   const isActive = canDrop && isOver;
 
   let boxMessage = 'No file selected';
-  if (isActive) {
+  if (readOnly) {
+    boxMessage = 'Item is read only';
+  } else if (isActive) {
     boxMessage = 'Release to drop file';
   } else if (errorMessage) {
     boxMessage = errorMessage;
@@ -51,7 +54,8 @@ function AttachmentFileDropBox(props: AttachmentFileDropBoxProps) {
       isActive={isActive}
       isTabled={isTabled}>
       <Box p={1.5}>
-        <Typography>{boxMessage}</Typography>
+        <Typography color={readOnly ? 'text.disabled' : 'text.primary'}>{boxMessage}</Typography>
+
         {file ? (
           <Box pt={1}>
             <Typography fontSize={10}>Size: {getFileSize(file.size.toString() ?? '0')}</Typography>

package/src/components/FormComponents/AttachmentItem/AttachmentUrlField.tsx

@@ -41,7 +41,9 @@ function AttachmentUrlField(props: AttachmentUrlFieldProps) {
 
   return (
     <Box>
-      <Typography variant="body2">URL</Typography>
+      <Typography variant="body2" color={readOnly ? 'text.disabled' : 'text.primary'}>
+        URL
+      </Typography>
       <Stack direction="row" alignItems="center">
         <StandardTextField
           fullWidth

package/src/components/FormComponents/BooleanItem/BooleanField.tsx

@@ -48,9 +48,9 @@ const BooleanField = memo(function BooleanField(props: BooleanFieldProps) {
   return (
     <Box display="flex" alignItems="center">
       <StyledRadioGroup
+        id={qItem.linkId}
         row={orientation === ChoiceItemOrientation.Horizontal}
         name={qItem.text}
-        id={qItem.id}
         onChange={(e) => onCheckedChange(e.target.value)}
         value={selection}>
         <ChoiceRadioSingle value="true" label="Yes" readOnly={readOnly} />

package/src/components/FormComponents/ChoiceItems/ChoiceAutocompleteField.tsx

@@ -64,7 +64,7 @@ function ChoiceAutocompleteField(props: ChoiceAutocompleteFieldsProps) {
 
   return (
     <Autocomplete
-      id={qItem.id}
+      id={qItem.linkId}
       value={valueCoding ?? null}
       options={options}
       getOptionLabel={(option) => option.display ?? `${option.code}`}

package/src/components/FormComponents/ChoiceItems/ChoiceRadioAnswerOptionFields.tsx

@@ -46,9 +46,9 @@ function ChoiceRadioAnswerOptionFields(props: ChoiceRadioAnswerOptionFieldsProps
   return (
     <Box display="flex" alignItems="center">
       <StyledRadioGroup
+        id={qItem.linkId}
         row={orientation === ChoiceItemOrientation.Horizontal}
         name={qItem.text}
-        id={qItem.id}
         onChange={(e) => onCheckedChange(e.target.value)}
         value={valueRadio}
         data-test="q-item-radio-group">

package/src/components/FormComponents/ChoiceItems/ChoiceRadioAnswerValueSetFields.tsx

@@ -61,9 +61,9 @@ function ChoiceRadioAnswerValueSetFields(props: ChoiceRadioAnswerValueSetFieldsP
     return (
       <Box display="flex" alignItems="center">
         <StyledRadioGroup
+          id={qItem.linkId}
           row={orientation === ChoiceItemOrientation.Horizontal}
           name={qItem.text}
-          id={qItem.id}
           onChange={(e) => onCheckedChange(e.target.value)}
           value={valueRadio}
           data-test="q-item-radio-group">

package/src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerOptionFields.tsx

@@ -41,7 +41,7 @@ function ChoiceSelectAnswerOptionFields(props: ChoiceSelectAnswerOptionFieldsPro
 
   return (
     <Autocomplete
-      id={qItem.id}
+      id={qItem.linkId}
       value={valueSelect ?? null}
       options={options}
       getOptionLabel={(option) => getAnswerOptionLabel(option)}
@@ -68,7 +68,6 @@ function ChoiceSelectAnswerOptionFields(props: ChoiceSelectAnswerOptionFieldsPro
               </>
             )
           }}
-          data-test="q-item-choice-dropdown-answer-value-set-field"
         />
       )}
     />

package/src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.tsx

@@ -54,7 +54,7 @@ function ChoiceSelectAnswerValueSetFields(props: ChoiceSelectAnswerValueSetField
   if (codings.length > 0) {
     return (
       <Autocomplete
-        id={qItem.id}
+        id={qItem.linkId}
         options={codings}
         getOptionLabel={(option) => option.display ?? `${option.code}`}
         value={valueCoding ?? null}
@@ -80,7 +80,7 @@ function ChoiceSelectAnswerValueSetFields(props: ChoiceSelectAnswerValueSetField
                 </>
               )
             }}
-            data-test="q-item-choice-dropdown-answer-value-set-field"
+            data-test="q-item-choice-select-answer-value-set-field"
           />
         )}
       />

package/src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetItem.tsx

@@ -129,8 +129,7 @@ function ChoiceSelectAnswerValueSetItem(props: ChoiceSelectAnswerValueSetItemPro
 
   return (
     <FullWidthFormComponentBox
-      data-test="q-item-choice-dropdown-answer-value-set-box"
-      data-linkid={qItem.linkId}
+      data-test="q-item-choice-select-answer-value-set-box"
       onClick={() => onFocusLinkId(qItem.linkId)}>
       <ItemFieldGrid qItem={qItem} readOnly={readOnly}>
         <ChoiceSelectAnswerValueSetFields

package/src/components/FormComponents/DateTimeItems/CustomDateItem/CustomDateField.tsx

@@ -58,7 +58,7 @@ function CustomDateField(props: CustomDateFieldProps) {
   return (
     <Tooltip title={isTabled ? feedback : ''}>
       <StandardTextField
-        id={linkId}
+        id={linkId + '-date'}
         ref={anchorRef}
         fullWidth
         isTabled={isTabled}

package/src/components/FormComponents/DateTimeItems/CustomDateTimeItem/CustomDateTimeItem.tsx

@@ -197,7 +197,7 @@ function CustomDateTimeItem(props: CustomDateTimeItemProps) {
 
   return (
     <FullWidthFormComponentBox
-      data-test="q-item-date-box"
+      data-test="q-item-datetime-box"
       data-linkid={qItem.linkId}
       onClick={() => onFocusLinkId(qItem.linkId)}>
       <ItemFieldGrid qItem={qItem} readOnly={readOnly}>

package/src/components/FormComponents/ItemParts/ItemFieldGrid.tsx

@@ -35,11 +35,11 @@ function ItemFieldGrid(props: ItemFieldGridProps) {
   const { displayInstructions } = useRenderingExtensions(qItem);
 
   return (
-    <Grid container columnSpacing={6}>
-      <Grid item xs={5}>
+    <Grid container columnSpacing={4}>
+      <Grid item xs={4}>
         <LabelWrapper qItem={qItem} readOnly={readOnly} />
       </Grid>
-      <Grid item xs={7}>
+      <Grid item xs={8}>
         {children}
         <DisplayInstructions displayInstructions={displayInstructions} readOnly={readOnly} />
       </Grid>

package/src/components/FormComponents/OpenChoiceItems/OpenChoiceAutocompleteField.tsx

@@ -70,7 +70,7 @@ function OpenChoiceAutocompleteField(props: OpenChoiceAutocompleteFieldProps) {
   return (
     <Box display="flex">
       <Autocomplete
-        id={qItem.id}
+        id={qItem.linkId}
         value={valueAutocomplete}
         options={options}
         getOptionLabel={(option) =>

package/src/components/FormComponents/OpenChoiceItems/OpenChoiceRadioAnswerOptionFields.tsx

@@ -51,9 +51,9 @@ function OpenChoiceRadioAnswerOptionFields(props: OpenChoiceRadioAnswerOptionFie
 
   return (
     <StyledRadioGroup
+      id={qItem.linkId}
       row={orientation === ChoiceItemOrientation.Horizontal}
       name={qItem.text}
-      id={qItem.id}
       onChange={(e: ChangeEvent<HTMLInputElement>) => onValueChange(e.target.value, null)}
       value={valueRadio}
       data-test="q-item-radio-group">

package/src/components/FormComponents/OpenChoiceItems/OpenChoiceRadioAnswerValueSetFields.tsx

@@ -58,9 +58,9 @@ function OpenChoiceRadioAnswerValueSetFields(props: OpenChoiceRadioAnswerValueSe
   if (options.length > 0) {
     return (
       <StyledRadioGroup
+        id={qItem.linkId}
         row={orientation === ChoiceItemOrientation.Horizontal}
         name={qItem.text}
-        id={qItem.id}
         onChange={(e: ChangeEvent<HTMLInputElement>) => onValueChange(e.target.value, null)}
         value={valueRadio}
         data-test="q-item-radio-group">

package/src/components/FormComponents/OpenChoiceItems/OpenChoiceSelectAnswerOptionField.tsx

@@ -26,7 +26,7 @@ function OpenChoiceSelectAnswerOptionField(props: OpenChoiceSelectAnswerOptionFi
 
   return (
     <Autocomplete
-      id={qItem.id}
+      id={qItem.linkId}
       value={valueSelect ?? null}
       options={options}
       getOptionLabel={(option) => getAnswerOptionLabel(option)}

package/src/components/FormComponents/OpenChoiceItems/OpenChoiceSelectAnswerValueSetField.tsx

@@ -30,7 +30,7 @@ function OpenChoiceSelectAnswerValueSetField(props: OpenChoiceSelectAnswerValueS
   return (
     <>
       <Autocomplete
-        id={qItem.id}
+        id={qItem.linkId}
         value={valueSelect ?? null}
         options={options}
         getOptionLabel={(option) =>

package/src/components/FormComponents/UrlItem/UrlItem.tsx

@@ -97,7 +97,7 @@ function UrlItem(props: UrlItemProps) {
   }
   return (
     <FullWidthFormComponentBox
-      data-test="q-item-string-box"
+      data-test="q-item-url-box"
       data-linkid={qItem.linkId}
       onClick={() => onFocusLinkId(qItem.linkId)}>
       <ItemFieldGrid qItem={qItem} readOnly={readOnly}>

package/src/stories/assets/questionnaires/QPrePopTester.ts

@@ -0,0 +1,201 @@
+/*
+ * Copyright 2024 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Questionnaire } from 'fhir/r4';
+
+export const qSelectivePrePopTester: Questionnaire = {
+  resourceType: 'Questionnaire',
+  id: 'SelectivePrePopTester',
+  name: 'SelectivePrePopTester',
+  title: 'Selective Pre-pop Tester',
+  version: '0.1.0',
+  status: 'draft',
+  publisher: 'AEHRC CSIRO',
+  date: '2024-05-01',
+  url: 'https://smartforms.csiro.au/docs/tester/prepop-1',
+  contained: [
+    {
+      resourceType: 'ValueSet',
+      id: 'administrative-gender',
+      meta: {
+        profile: ['http://hl7.org/fhir/StructureDefinition/shareablevalueset']
+      },
+      extension: [
+        {
+          url: 'http://hl7.org/fhir/StructureDefinition/structuredefinition-wg',
+          valueCode: 'pa'
+        },
+        {
+          url: 'http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status',
+          valueCode: 'normative'
+        },
+        {
+          url: 'http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm',
+          valueInteger: 5
+        },
+        {
+          url: 'http://hl7.org/fhir/StructureDefinition/structuredefinition-normative-version',
+          valueCode: '4.0.0'
+        }
+      ],
+      url: 'http://hl7.org/fhir/ValueSet/administrative-gender',
+      identifier: [
+        {
+          system: 'urn:ietf:rfc:3986',
+          value: 'urn:oid:2.16.840.1.113883.4.642.3.1'
+        }
+      ],
+      version: '4.0.1',
+      name: 'AdministrativeGender',
+      title: 'AdministrativeGender',
+      status: 'active',
+      experimental: false,
+      date: '2019-11-01T09:29:23+11:00',
+      publisher: 'HL7 (FHIR Project)',
+      contact: [
+        {
+          telecom: [
+            {
+              system: 'url',
+              value: 'http://hl7.org/fhir'
+            },
+            {
+              system: 'email',
+              value: 'fhir@lists.hl7.org'
+            }
+          ]
+        }
+      ],
+      description: 'The gender of a person used for administrative purposes.',
+      immutable: true,
+      copyright: 'Copyright © 2011+ HL7. Licensed under Creative Commons "No Rights Reserved".',
+      compose: {
+        include: [
+          {
+            system: 'http://hl7.org/fhir/administrative-gender'
+          }
+        ]
+      },
+      expansion: {
+        identifier: 'urn:uuid:50f050c9-3975-48d6-bdb7-baae4ebc70cd',
+        timestamp: '2024-04-05T12:31:27+10:00',
+        total: 4,
+        parameter: [
+          {
+            name: 'version',
+            valueUri: 'http://hl7.org/fhir/administrative-gender|4.0.1'
+          },
+          {
+            name: 'used-codesystem',
+            valueUri: 'http://hl7.org/fhir/administrative-gender|4.0.1'
+          }
+        ],
+        contains: [
+          {
+            system: 'http://hl7.org/fhir/administrative-gender',
+            code: 'female',
+            display: 'Female'
+          },
+          {
+            system: 'http://hl7.org/fhir/administrative-gender',
+            code: 'male',
+            display: 'Male'
+          },
+          {
+            system: 'http://hl7.org/fhir/administrative-gender',
+            code: 'other',
+            display: 'Other'
+          },
+          {
+            system: 'http://hl7.org/fhir/administrative-gender',
+            code: 'unknown',
+            display: 'Unknown'
+          }
+        ]
+      }
+    }
+  ],
+  extension: [
+    {
+      url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext',
+      extension: [
+        {
+          url: 'name',
+          valueCoding: {
+            system: 'http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext',
+            code: 'patient'
+          }
+        },
+        {
+          url: 'type',
+          valueCode: 'Patient'
+        },
+        {
+          url: 'description',
+          valueString: 'The patient that is to be used to pre-populate the form'
+        }
+      ]
+    }
+  ],
+  item: [
+    {
+      linkId: 'display-description',
+      extension: [
+        {
+          url: 'http://hl7.org/fhir/StructureDefinition/rendering-xhtml',
+          valueString:
+            '<div xmlns="http://www.w3.org/1999/xhtml">\r\n    <div style="font-size:0.875em"> This questionnaire is used by Playwright to do regression testing of the <pre style="display: inline">@aehrc/sdc-populate</pre> library\'s pre-population logic. Items will be incrementally added as needed.</div><br/></div>'
+        }
+      ],
+      text: "This questionnaire is used by Playwright to do regression testing of the @aehrc/sdc-populate library's pre-population logic. Items will be incrementally added as needed.",
+      type: 'display',
+      repeats: false
+    },
+    {
+      extension: [
+        {
+          url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression',
+          valueExpression: {
+            language: 'text/fhirpath',
+            expression: '%patient.gender'
+          }
+        }
+      ],
+      linkId: 'gender-avs-url',
+      text: 'Administrative gender (answerValueSet url)',
+      type: 'choice',
+      repeats: false,
+      answerValueSet: 'http://hl7.org/fhir/ValueSet/administrative-gender'
+    },
+    {
+      extension: [
+        {
+          url: 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression',
+          valueExpression: {
+            language: 'text/fhirpath',
+            expression: '%patient.gender'
+          }
+        }
+      ],
+      linkId: 'gender-avs-contained',
+      text: 'Administrative gender (answerValueSet contained)',
+      type: 'choice',
+      repeats: false,
+      answerValueSet: 'http://hl7.org/fhir/ValueSet/administrative-gender'
+    }
+  ]
+};

package/src/stories/testing/BuildFormButtonTesterWrapper.stories.tsx

@@ -18,7 +18,6 @@
 import type { Meta, StoryObj } from '@storybook/react';
 import BuildFormButtonTesterWrapperForStorybook from '../storybookWrappers/BuildFormButtonTesterWrapperForStorybook';
 import { qButtonTester, qrButtonTesterResponse } from '../assets/questionnaires/QButtonTester';
-import { qBooleanBasic, qrBooleanBasicResponse } from '../assets/questionnaires';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
@@ -39,10 +38,3 @@ export const BuildFormButtonTester: Story = {
     questionnaireResponse: qrButtonTesterResponse
   }
 };
-
-export const BuildFormButtonTesterBoolean: Story = {
-  args: {
-    questionnaire: qBooleanBasic,
-    questionnaireResponse: qrBooleanBasicResponse
-  }
-};

package/src/stories/testing/PrePopButtonTesterWrapper.stories.tsx

@@ -21,10 +21,11 @@ import { mockFhirClient } from '../assets/fhirClient/mockFhirClient';
 import { patSmartForm } from '../assets/patients/PatSmartForm';
 import { pracPrimaryPeter } from '../assets/practitioners/PracPrimaryPeter';
 import { qButtonTester } from '../assets/questionnaires/QButtonTester';
+import { qSelectivePrePopTester } from '../assets/questionnaires/QPrePopTester';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
-  title: 'Component/Testing/Pre Pop Button Tester',
+  title: 'Component/Testing/Pre Pop Tester',
   component: PrePopWrapperForStorybook,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
   tags: []
@@ -35,7 +36,7 @@ type Story = StoryObj<typeof meta>;
 
 // More on writing stories with args: https://storybook.js.org/docs/react/writing-stories/args
 
-export const PrePopButtonTester: Story = {
+export const BasicPrePopTester: Story = {
   args: {
     questionnaire: qButtonTester,
     fhirClient: mockFhirClient,
@@ -43,3 +44,12 @@ export const PrePopButtonTester: Story = {
     user: pracPrimaryPeter
   }
 };
+
+export const SelectivePrePopTester: Story = {
+  args: {
+    questionnaire: qSelectivePrePopTester,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};

package/src/utils/openChoice.ts

@@ -153,7 +153,7 @@ export function getAnswerOptionLabel(option: QuestionnaireItemAnswerOption | str
   }
 
   if (option['valueCoding']) {
-    return `${option.valueCoding.display}`;
+    return option.valueCoding.display ?? `${option.valueCoding.code}`;
   } else if (option['valueString']) {
     return option.valueString;
   } else if (option['valueInteger']) {