@aehrc/smart-forms-renderer 0.28.0 → 0.30.0

package/src/stories/sdc/FormPopulation.stories.tsx

@@ -0,0 +1,97 @@
+/*
+ * 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 PrePopWrapper from '../PrePopWrapper';
+import {
+  qCalculatedExpressionBMICalculatorPrepop,
+  qCalculatedExpressionCvdRiskCalculatorPrepop,
+  qInitialExpressionBasic,
+  qItemPopulationContextHomeAddress,
+  qItemPopulationContextMedicalHistory,
+  qSourceQueriesBMICalculator
+} from '../assets/questionnaires/QFormPopulation';
+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/SDC/12 Form Population',
+  component: PrePopWrapper,
+  // This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
+  tags: []
+} satisfies Meta<typeof PrePopWrapper>;
+
+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 InitialExpression: Story = {
+  args: {
+    questionnaire: qInitialExpressionBasic,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const CalculatedExpressionBMICalculatorPrepop: Story = {
+  args: {
+    questionnaire: qCalculatedExpressionBMICalculatorPrepop,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const CalculatedExpressionCvdRiskCalculatorPrepop: Story = {
+  args: {
+    questionnaire: qCalculatedExpressionCvdRiskCalculatorPrepop,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const ItemPopulationContextHomeAddress: Story = {
+  args: {
+    questionnaire: qItemPopulationContextHomeAddress,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const ItemPopulationContextMedicalHistory: Story = {
+  args: {
+    questionnaire: qItemPopulationContextMedicalHistory,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};
+
+export const SourceQueriesBMICalculator: Story = {
+  args: {
+    questionnaire: qSourceQueriesBMICalculator,
+    fhirClient: mockFhirClient,
+    patient: patSmartForm,
+    user: pracPrimaryPeter
+  }
+};

package/src/stories/useBuildFormForStorybook.ts

@@ -0,0 +1,37 @@
+/*
+ * 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 { useLayoutEffect, useState } from 'react';
+import { buildForm } from '../utils';
+import type { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
+
+function useBuildFormForStorybook(
+  questionnaire: Questionnaire,
+  questionnaireResponse?: QuestionnaireResponse
+) {
+  const [isBuilding, setIsBuilding] = useState(true);
+
+  useLayoutEffect(() => {
+    buildForm(questionnaire, questionnaireResponse).then(() => {
+      setIsBuilding(false);
+    });
+  }, [questionnaire, questionnaireResponse]);
+
+  return isBuilding;
+}
+
+export default useBuildFormForStorybook;

package/src/utils/calculatedExpression.ts

@@ -267,7 +267,7 @@ function initialiseItemCalculatedExpressionValueRecursive(
     return constructGroupItem(qItem, qrItem, calculatedExpressions);
   }
 
-  return constructSingleItem(qItem, calculatedExpressions);
+  return constructSingleItem(qItem, qrItem, calculatedExpressions);
 }
 
 function getCalculatedExpressionAnswer(
@@ -317,11 +317,12 @@ function constructGroupItem(
 
 function constructSingleItem(
   qItem: QuestionnaireItem,
+  qrItem: QuestionnaireResponseItem | undefined,
   calculatedExpressions: Record<string, CalculatedExpression[]>
 ): QuestionnaireResponseItem | null {
   const calculatedExpressionAnswer = getCalculatedExpressionAnswer(qItem, calculatedExpressions);
   if (!calculatedExpressionAnswer) {
-    return null;
+    return qrItem ?? null;
   }
 
   return {

package/storybook.log

@@ -0,0 +1,6 @@
+npm ERR! code ETARGET
+npm ERR! notarget No matching version found for @storybook/addon-queryparams@^8.0.10.
+npm ERR! notarget In most cases you or one of your dependencies are requesting
+npm ERR! notarget a package version that doesn't exist.
+
+npm ERR! A complete log of this run can be found in: /Users/fon026/.npm/_logs/2024-05-17T03_53_47_310Z-debug-0.log

package/vite.config.ts

@@ -17,7 +17,17 @@
 
 import { defineConfig } from 'vite';
 
+// This Vite config is for storybook usage only.
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: []
+  plugins: [],
+  optimizeDeps: {
+    include: ['@aehrc/sdc-populate']
+  },
+  build: {
+    commonjsOptions: {
+      include: [/node_modules/, '@aehrc/sdc-populate']
+    }
+  },
+  resolve: { preserveSymlinks: true }
 });