@aehrc/smart-forms-renderer 0.34.0 → 0.34.1

package/src/stories/storybookWrappers/PrePopWrapperForStorybook.tsx

@@ -27,6 +27,7 @@ import PrePopButtonForStorybook from './PrePopButtonForStorybook';
 import { populateQuestionnaire } from '@aehrc/sdc-populate';
 import { fetchResourceCallback } from './populateCallbackForStorybook';
 import { buildForm } from '../../utils';
+import { STORYBOOK_TERMINOLOGY_SERVER_URL } from './globals';
 
 interface PrePopWrapperForStorybookProps {
   questionnaire: Questionnaire;
@@ -75,7 +76,12 @@ function PrePopWrapperForStorybook(props: PrePopWrapperForStorybookProps) {
       const { populatedResponse } = populateResult;
 
       // Call to buildForm to pre-populate the QR which repaints the entire BaseRenderer view
-      await buildForm(questionnaire, populatedResponse);
+      await buildForm(
+        questionnaire,
+        populatedResponse,
+        undefined,
+        STORYBOOK_TERMINOLOGY_SERVER_URL
+      );
 
       setIsPopulating(false);
     });

package/src/stories/storybookWrappers/globals.ts

@@ -0,0 +1,18 @@
+/*
+ * 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.
+ */
+
+export const STORYBOOK_TERMINOLOGY_SERVER_URL = 'https://r4.ontoserver.csiro.au/fhir';

package/src/stories/testing/GroupTableTester.stories.tsx

@@ -0,0 +1,39 @@
+/*
+ * 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 BuildFormWrapperForStorybook from '../storybookWrappers/BuildFormWrapperForStorybook';
+import { qGTableWithBoolean } from '../assets/questionnaires/QGroupTableTester';
+
+// More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
+const meta = {
+  title: 'Component/Testing/Group Table Tester',
+  component: BuildFormWrapperForStorybook,
+  // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
+  tags: []
+} satisfies Meta<typeof BuildFormWrapperForStorybook>;
+
+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 GroupTableWithBoolean: Story = {
+  args: {
+    questionnaire: qGTableWithBoolean
+  }
+};

package/src/utils/choice.ts

@@ -80,6 +80,34 @@ export function findInAnswerOptions(
   return;
 }
 
+/**
+ * Compare answer option value with selected value via valueString, valueInteger, or valueCoding.code
+ *
+ * @author Sean Fong
+ */
+export function compareAnswerOptionValue(
+  option: QuestionnaireItemAnswerOption,
+  value: QuestionnaireItemAnswerOption
+): boolean {
+  if (!value) {
+    return false;
+  }
+
+  if (value.valueString) {
+    return option.valueString === value.valueString;
+  }
+
+  if (value.valueInteger) {
+    return option.valueInteger === value.valueInteger;
+  }
+
+  if (value.valueCoding && value.valueCoding.code) {
+    return option.valueCoding?.code === value.valueCoding.code;
+  }
+
+  return false;
+}
+
 /**
  * Get choice control type based on certain criteria in choice items
  *
@@ -105,22 +133,6 @@ export function getChoiceControlType(qItem: QuestionnaireItem) {
   return ChoiceItemControl.Select;
 }
 
-/**
- * Find and return corresponding coding from AnswerValueSet based on selected answer in form
- *
- * @author Sean Fong
- */
-export function findInAnswerValueSetCodings(
-  codings: Coding[],
-  selected: string
-): QuestionnaireResponseItemAnswer | undefined {
-  for (const coding of codings) {
-    if (selected === coding.code) {
-      return coding;
-    }
-  }
-}
-
 /**
  * Find and return string value from selected answer
  *

package/src/utils/itemControl.ts

@@ -19,6 +19,13 @@ import type { Coding, Extension, QuestionnaireItem } from 'fhir/r4';
 import type { RegexValidation } from '../interfaces/regex.interface';
 import { structuredDataCapture } from 'fhir-sdc-helpers';
 
+function hasDisplayCategory(qItem: QuestionnaireItem): boolean {
+  return !!qItem.extension?.some(
+    (extension: Extension) =>
+      extension.url === 'http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory'
+  );
+}
+
 function hasItemControl(qItem: QuestionnaireItem): boolean {
   return !!qItem.extension?.some(
     (extension: Extension) =>
@@ -29,7 +36,8 @@ function hasItemControl(qItem: QuestionnaireItem): boolean {
 // 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)
+    (childItem) =>
+      childItem.type === 'display' && (hasDisplayCategory(childItem) || hasItemControl(childItem))
   );
 }