@aehrc/smart-forms-renderer 0.9.3 → 0.10.1

package/src/stores/{useTerminologyServerStore.ts → terminologyServerStore.ts}

@@ -15,20 +15,21 @@
  * limitations under the License.
  */
 
-import { create } from 'zustand';
+import { createStore } from 'zustand/vanilla';
+import { createSelectors } from './selector';
 
 const ONTOSERVER_R4 = 'https://r4.ontoserver.csiro.au/fhir';
 
-export interface UseTerminologyServerStoreType {
+interface TerminologyServerStoreType {
   url: string;
   setUrl: (newUrl: string) => void;
   resetUrl: () => void;
 }
 
-const useTerminologyServerStore = create<UseTerminologyServerStoreType>()((set) => ({
+export const terminologyServerStore = createStore<TerminologyServerStoreType>()((set) => ({
   url: ONTOSERVER_R4,
   setUrl: (newUrl: string) => set(() => ({ url: newUrl })),
   resetUrl: () => set(() => ({ url: ONTOSERVER_R4 }))
 }));
 
-export default useTerminologyServerStore;
+export const useTerminologyServerStore = createSelectors(terminologyServerStore);

package/src/stories/MedicalHistoryTable.stories.tsx

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2023 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 ThemeProvider from '../theme/Theme';
+import type { Meta, StoryObj } from '@storybook/react';
+import { GroupTable } from '../components';
+import GTableMedicalHistoryItemJson from './assets/QItems-and-QRItems/Q_GTableMedicalHistory.json';
+import GTableMedicalHistoryAnswersJson from './assets/QItems-and-QRItems/QR_GTableMedicalHistory.json';
+import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+
+// More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
+const meta = {
+  title: 'Component/GroupTable',
+  component: GroupTable,
+  // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
+  tags: [],
+  decorators: [
+    (Story) => (
+      <ThemeProvider>
+        <QueryClientProvider client={new QueryClient()}>{Story()}</QueryClientProvider>
+      </ThemeProvider>
+    )
+  ]
+} satisfies Meta<typeof GroupTable>;
+
+const GTableMedicalHistoryItem = GTableMedicalHistoryItemJson as QuestionnaireItem;
+const GTableMedicalHistoryAnswers = GTableMedicalHistoryAnswersJson as QuestionnaireResponseItem[];
+
+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 MedicalHistoryTable: Story = {
+  args: {
+    qItem: GTableMedicalHistoryItem,
+    qrItems: GTableMedicalHistoryAnswers,
+    groupCardElevation: 1,
+    parentIsReadOnly: false,
+    onQrRepeatGroupChange: () => {}
+  }
+};

package/src/stories/SmartFormsRenderer.stories.ts

@@ -18,24 +18,28 @@
 import type { Meta, StoryObj } from '@storybook/react';
 import { SmartFormsRenderer } from '../components';
 import type { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
-import Q715Json from './assets/Q715.json';
-import R715Json from './assets/R715.json';
-import QTestGridJson from './assets/QTestGrid.json';
-import RTestGridJson from './assets/RTestGrid.json';
+import Q715Json from './assets/Qs-and-QRs/Q715.json';
+import R715Json from './assets/Qs-and-QRs/R715.json';
+import QTestGridJson from './assets/Qs-and-QRs/QTestGrid.json';
+import RTestGridJson from './assets/Qs-and-QRs/RTestGrid.json';
+import QDev715Json from './assets/Qs-and-QRs/QDev715.json';
 
 // More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
 const meta = {
   title: 'Component/SmartFormsRenderer',
   component: SmartFormsRenderer,
   // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
-  tags: ['autodocs']
+  tags: []
 } satisfies Meta<typeof SmartFormsRenderer>;
 
 const Q715 = Q715Json as Questionnaire;
 const R715 = R715Json as QuestionnaireResponse;
+
 const QTestGrid = QTestGridJson as Questionnaire;
 const RTestGrid = RTestGridJson as QuestionnaireResponse;
 
+const QDev715 = QDev715Json as Questionnaire;
+
 export default meta;
 type Story = StoryObj<typeof meta>;
 
@@ -54,6 +58,12 @@ export const Form715WithResponse: Story = {
   }
 };
 
+export const FormDev715: Story = {
+  args: {
+    questionnaire: QDev715
+  }
+};
+
 export const FormTestGrid: Story = {
   args: {
     questionnaire: QTestGrid

package/src/stories/assets/QItems-and-QRItems/QR_GTableMedicalHistory.json

@@ -0,0 +1,80 @@
+[
+  {
+    "linkId": "92bd7d05-9b5e-4cf9-900b-703f361dad9d",
+    "text": "Medical history and current problems list",
+    "item": [
+      {
+        "linkId": "59b1900a-4f85-4a8c-b9cd-3fe2fd76f27e",
+        "text": "Condition",
+        "answer": [
+          {
+            "valueString": "Large diffuse B-cell lymphoma of the brain"
+          }
+        ]
+      },
+      {
+        "linkId": "88bcfad7-386b-4d87-b34b-2e50482e4d2c",
+        "text": "Clinical Status",
+        "answer": [
+          {
+            "valueCoding": {
+              "system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
+              "code": "active",
+              "display": "Active"
+            }
+          }
+        ]
+      },
+      {
+        "linkId": "18b9e159-2ed7-4047-82b7-deb2a171de4f",
+        "text": "Recorded Date",
+        "answer": [
+          {
+            "valueDate": "2021-02-01"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "linkId": "92bd7d05-9b5e-4cf9-900b-703f361dad9d",
+    "text": "Medical history and current problems list",
+    "item": [
+      {
+        "linkId": "59b1900a-4f85-4a8c-b9cd-3fe2fd76f27e",
+        "text": "Condition",
+        "answer": [
+          {
+            "valueCoding": {
+              "system": "http://snomed.info/sct",
+              "code": "56731001",
+              "display": "Hypertonia"
+            }
+          }
+        ]
+      },
+      {
+        "linkId": "88bcfad7-386b-4d87-b34b-2e50482e4d2c",
+        "text": "Clinical Status",
+        "answer": [
+          {
+            "valueCoding": {
+              "system": "http://terminology.hl7.org/CodeSystem/condition-clinical",
+              "code": "inactive",
+              "display": "Inactive"
+            }
+          }
+        ]
+      },
+      {
+        "linkId": "18b9e159-2ed7-4047-82b7-deb2a171de4f",
+        "text": "Recorded Date",
+        "answer": [
+          {
+            "valueDate": "2023-11-08"
+          }
+        ]
+      }
+    ]
+  }
+]

package/src/stories/assets/QItems-and-QRItems/Q_GTableMedicalHistory.json

@@ -0,0 +1,109 @@
+{
+  "extension": [
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+      "valueCodeableConcept": {
+        "coding": [
+          {
+            "system": "http://hl7.org/fhir/questionnaire-item-control",
+            "code": "gtable"
+          }
+        ]
+      }
+    },
+    {
+      "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-itemPopulationContext",
+      "valueExpression": {
+        "name": "ConditionRepeat",
+        "language": "text/fhirpath",
+        "expression": "%Condition.entry.resource"
+      }
+    }
+  ],
+  "linkId": "92bd7d05-9b5e-4cf9-900b-703f361dad9d",
+  "text": "Medical history and current problems list",
+  "type": "group",
+  "repeats": true,
+  "item": [
+    {
+      "extension": [
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+          "valueCodeableConcept": {
+            "coding": [
+              {
+                "system": "http://hl7.org/fhir/questionnaire-item-control",
+                "code": "autocomplete"
+              }
+            ]
+          }
+        },
+        {
+          "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
+          "valueExpression": {
+            "language": "text/fhirpath",
+            "expression": "%ConditionRepeat.code.select((coding.where(system='http://snomed.info/sct') | coding.where(system!='http://snomed.info/sct').first() | text ).first())"
+          }
+        }
+      ],
+      "linkId": "59b1900a-4f85-4a8c-b9cd-3fe2fd76f27e",
+      "text": "Condition",
+      "type": "open-choice",
+      "answerValueSet": "https://smartforms.csiro.au/ig/ValueSet/MedicalHistory"
+    },
+    {
+      "extension": [
+        {
+          "url": "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl",
+          "valueCodeableConcept": {
+            "coding": [
+              {
+                "system": "http://hl7.org/fhir/questionnaire-item-control",
+                "code": "drop-down"
+              }
+            ]
+          }
+        },
+        {
+          "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
+          "valueExpression": {
+            "language": "text/fhirpath",
+            "expression": "%ConditionRepeat.clinicalStatus.coding"
+          }
+        }
+      ],
+      "linkId": "88bcfad7-386b-4d87-b34b-2e50482e4d2c",
+      "text": "Clinical Status",
+      "type": "choice",
+      "answerValueSet": "http://hl7.org/fhir/ValueSet/condition-clinical"
+    },
+    {
+      "extension": [
+        {
+          "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
+          "valueExpression": {
+            "language": "text/fhirpath",
+            "expression": "%ConditionRepeat.onset.ofType(dateTime)"
+          }
+        }
+      ],
+      "linkId": "6ae641ad-95bb-4cdc-8910-5a52077e492c",
+      "text": "Onset Date",
+      "type": "date"
+    },
+    {
+      "extension": [
+        {
+          "url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-initialExpression",
+          "valueExpression": {
+            "language": "text/fhirpath",
+            "expression": "%ConditionRepeat.recordedDate"
+          }
+        }
+      ],
+      "linkId": "18b9e159-2ed7-4047-82b7-deb2a171de4f",
+      "text": "Recorded Date",
+      "type": "date"
+    }
+  ]
+}