@aehrc/smart-forms-renderer 0.33.0 → 0.34.0

package/src/stories/itemTypes/Display.stories.tsx

@@ -17,7 +17,11 @@
 
 import type { Meta, StoryObj } from '@storybook/react';
 import BuildFormWrapperForStorybook from '../storybookWrappers/BuildFormWrapperForStorybook';
-import { qDisplayBasic, qDisplayCalculation } from '../assets/questionnaires/QDisplay';
+import {
+  qDisplayBasic,
+  qDisplayCalculation,
+  qDisplayCalculationStyled
+} from '../assets/questionnaires/QDisplay';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
@@ -43,3 +47,9 @@ export const DisplayCalculation: Story = {
     questionnaire: qDisplayCalculation
   }
 };
+
+export const DisplayCalculationStyled: Story = {
+  args: {
+    questionnaire: qDisplayCalculationStyled
+  }
+};

package/src/stories/sdc/AdvancedControlAppearance.stories.tsx

@@ -17,7 +17,14 @@
 
 import type { Meta, StoryObj } from '@storybook/react';
 import BuildFormWrapperForStorybook from '../storybookWrappers/BuildFormWrapperForStorybook';
-import { qChoiceOrientation, qItemControl, qSliderStepValue } from '../assets/questionnaires';
+import {
+  qChoiceOrientation,
+  qCollapsibleDefaultClosed,
+  qCollapsibleDefaultOpen,
+  qCollapsibleNested,
+  qItemControl,
+  qSliderStepValue
+} from '../assets/questionnaires';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
@@ -49,3 +56,21 @@ export const SliderStepValue: Story = {
     questionnaire: qSliderStepValue
   }
 };
+
+export const CollapsibleDefaultOpen: Story = {
+  args: {
+    questionnaire: qCollapsibleDefaultOpen
+  }
+};
+
+export const CollapsibleDefaultClosed: Story = {
+  args: {
+    questionnaire: qCollapsibleDefaultClosed
+  }
+};
+
+export const CollapsibleNested: Story = {
+  args: {
+    questionnaire: qCollapsibleNested
+  }
+};

package/src/stories/sdc/AdvancedTextAppearance.stories.tsx

@@ -21,6 +21,7 @@ import {
   qDisplayCategoryInstructions,
   qHidden,
   qOpenLabel,
+  qRenderingStyleBooleanCheckboxItem,
   qRenderingXhtmlBooleanCheckboxItem,
   qRenderingXhtmlDisplayBase64ImageItem,
   qRenderingXhtmlDisplayListItem
@@ -39,6 +40,12 @@ type Story = StoryObj<typeof meta>;
 
 // More on writing stories with args: https://storybook.js.org/docs/react/writing-stories/args
 
+export const RenderingStyleBooleanCheckbox: Story = {
+  args: {
+    questionnaire: qRenderingStyleBooleanCheckboxItem
+  }
+};
+
 export const RenderingXHTMLBooleanCheckbox: Story = {
   args: {
     questionnaire: qRenderingXhtmlBooleanCheckboxItem

package/src/stories/testing/Mbs715Tester.stories.tsx

@@ -0,0 +1,57 @@
+/*
+ * 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 { Meta, StoryObj } from '@storybook/react';
+import PrePopWrapperForStorybook from '../storybookWrappers/PrePopWrapperForStorybook';
+import {
+  qBasicMbs715,
+  qModifiedMbs715WithCollapsible
+} from '../assets/questionnaires/QMbs715Tester';
+import { mockFhirClient } from '../assets/fhirClient/mockFhirClient';
+import { patSmartForm } from '../assets/patients/PatSmartForm';
+import { pracPrimaryPeter } from '../assets/practitioners/PracPrimaryPeter';
+
+// More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
+const meta = {
+  title: 'Component/Testing/MBS 715 Tester',
+  component: PrePopWrapperForStorybook,
+  // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
+  tags: []
+} satisfies Meta<typeof PrePopWrapperForStorybook>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+// More on writing stories with args: https://storybook.js.org/docs/react/writing-stories/args
+
+export const BasicMBS715: Story = {
+  args: {
+    questionnaire: qBasicMbs715,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const ModifiedMBS715WithCollapsible: Story = {
+  args: {
+    questionnaire: qModifiedMbs715WithCollapsible,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};

package/src/theme/overrides/Accordion.ts

@@ -22,7 +22,7 @@ export default function Accordion(theme: Theme) {
     MuiAccordion: {
       styleOverrides: {
         root: {
-          boxShadow: theme.customShadows.z1,
+          boxShadow: theme.customShadows.card,
           borderRadius: Number(theme.shape.borderRadius) * 2,
           '&:before': {
             display: 'none'

package/src/utils/itemControl.ts

@@ -19,6 +19,20 @@ import type { Coding, Extension, QuestionnaireItem } from 'fhir/r4';
 import type { RegexValidation } from '../interfaces/regex.interface';
 import { structuredDataCapture } from 'fhir-sdc-helpers';
 
+function hasItemControl(qItem: QuestionnaireItem): boolean {
+  return !!qItem.extension?.some(
+    (extension: Extension) =>
+      extension.url === 'http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl'
+  );
+}
+
+// If all nested items are of type display and have itemControl, then they should not be rendered
+export function shouldRenderNestedItems(qItem: QuestionnaireItem): boolean {
+  return !qItem.item?.every(
+    (childItem) => childItem.type === 'display' && hasItemControl(childItem)
+  );
+}
+
 /**
  * Check if the extension has an itemControl code equal to the given itemControlCode
  *

package/src/utils/qItem.ts

@@ -123,3 +123,27 @@ export function getLinkIdTypeTuplesFromItemRecursive(qItem: QuestionnaireItem):
 
   return linkIds;
 }
+
+export type CollapsibleType = 'default-open' | 'default-closed';
+
+function valueCodeIsCollapsibleType(valueCode: string): valueCode is CollapsibleType {
+  return valueCode === 'default-open' || valueCode === 'default-closed';
+}
+
+export function getGroupCollapsible(qItem: QuestionnaireItem): CollapsibleType | null {
+  const collapsibleExtension = qItem.extension?.find(
+    (ext) =>
+      ext.url === 'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-collapsible'
+  );
+
+  if (collapsibleExtension) {
+    if (
+      collapsibleExtension.valueCode &&
+      valueCodeIsCollapsibleType(collapsibleExtension.valueCode)
+    ) {
+      return collapsibleExtension.valueCode;
+    }
+  }
+
+  return null;
+}