@aehrc/smart-forms-renderer 0.35.2 → 0.35.3

package/lib/components/FormComponents/ItemParts/ItemFieldGrid.js

@@ -22,10 +22,10 @@ import useRenderingExtensions from '../../../hooks/useRenderingExtensions';
 function ItemFieldGrid(props) {
     const { children, qItem, readOnly } = props;
     const { displayInstructions } = useRenderingExtensions(qItem);
-    return (React.createElement(Grid, { container: true, columnSpacing: 6 },
-        React.createElement(Grid, { item: true, xs: 5 },
+    return (React.createElement(Grid, { container: true, columnSpacing: 4 },
+        React.createElement(Grid, { item: true, xs: 4 },
             React.createElement(LabelWrapper, { qItem: qItem, readOnly: readOnly })),
-        React.createElement(Grid, { item: true, xs: 7 },
+        React.createElement(Grid, { item: true, xs: 8 },
             children,
             React.createElement(DisplayInstructions, { displayInstructions: displayInstructions, readOnly: readOnly }))));
 }

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.2",
+  "version": "0.35.3",
   "description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
   "main": "lib/index.js",
   "scripts": {

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/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']) {