@aehrc/smart-forms-renderer 0.30.1 → 0.31.0

package/src/stores/questionnaireResponseStore.ts

@@ -31,7 +31,28 @@ import { validateQuestionnaire } from '../utils/validateQuestionnaire';
 import { questionnaireStore } from './questionnaireStore';
 import { createQuestionnaireResponseItemMap } from '../utils/questionnaireResponseStoreUtils/updatableResponseItems';
 
-interface QuestionnaireResponseStoreType {
+/**
+ * QuestionnaireResponseStore properties and methods
+ * Properties can be accessed for fine-grain details.
+ * Methods are usually used internally, using them from an external source is not recommended.
+ *
+ * @property sourceResponse - The original response created when the form is first initialised i.e. empty, pre-populated, opened saved draft
+ * @property updatableResponse - The current state of the response that is being updated via form fields
+ * @property updatableResponseItems - Key-value pair of updatableResponse items `Record<linkId, QR.item(s)>`
+ * @property formChangesHistory - Array of form changes history in the form of deep-diff objects
+ * @property invalidItems - Key-value pair of invalid items based on defined value constraints in the questionnaire `Record<linkId, OperationOutcome>`
+ * @property responseIsValid - Whether there are any invalid items in the response
+ * @method validateQuestionnaire - Used to validate the questionnaire response based on the questionnaire
+ * @method buildSourceResponse - Used to build the source response when the form is first initialised
+ * @method setUpdatableResponseAsPopulated - Used to set a pre-populated response as the current response
+ * @method updateResponse - Used to update the current response
+ * @method setUpdatableResponseAsSaved - Used to set a saved response as the current response
+ * @method setUpdatableResponseAsEmpty - Used to set an empty response as the current response
+ * @method destroySourceResponse - Used to destroy the source response  and reset all properties
+ *
+ * @author Sean Fong
+ */
+export interface QuestionnaireResponseStoreType {
   sourceResponse: QuestionnaireResponse;
   updatableResponse: QuestionnaireResponse;
   updatableResponseItems: Record<string, QuestionnaireResponseItem[]>;
@@ -50,6 +71,13 @@ interface QuestionnaireResponseStoreType {
   destroySourceResponse: () => void;
 }
 
+/**
+ * QuestionnaireResponse state management store which contains all properties and methods to manage the state of the questionnaireResponse.
+ * This is the vanilla version of the store which can be used in non-React environments.
+ * @see {QuestionnaireResponseStoreType} for available properties and methods.
+ *
+ * @author Sean Fong
+ */
 export const questionnaireResponseStore = createStore<QuestionnaireResponseStoreType>()(
   (set, get) => ({
     sourceResponse: cloneDeep(emptyResponse),
@@ -62,16 +90,9 @@ export const questionnaireResponseStore = createStore<QuestionnaireResponseStore
       questionnaire: Questionnaire,
       updatedResponse: QuestionnaireResponse
     ) => {
-      const enableWhenIsActivated = questionnaireStore.getState().enableWhenIsActivated;
-      const enableWhenItems = questionnaireStore.getState().enableWhenItems;
-      const enableWhenExpressions = questionnaireStore.getState().enableWhenExpressions;
-
       const updatedInvalidItems = validateQuestionnaire({
         questionnaire,
-        questionnaireResponse: updatedResponse,
-        enableWhenIsActivated,
-        enableWhenItems,
-        enableWhenExpressions
+        questionnaireResponse: updatedResponse
       });
 
       set(() => ({
@@ -80,49 +101,99 @@ export const questionnaireResponseStore = createStore<QuestionnaireResponseStore
       }));
     },
     buildSourceResponse: (questionnaireResponse: QuestionnaireResponse) => {
+      const sourceQuestionnaire = questionnaireStore.getState().sourceQuestionnaire;
+      const initialInvalidItems = validateQuestionnaire({
+        questionnaire: sourceQuestionnaire,
+        questionnaireResponse: questionnaireResponse
+      });
+
       set(() => ({
         sourceResponse: questionnaireResponse,
         updatableResponse: questionnaireResponse,
-        updatableResponseItems: createQuestionnaireResponseItemMap(questionnaireResponse)
+        updatableResponseItems: createQuestionnaireResponseItemMap(questionnaireResponse),
+        invalidItems: initialInvalidItems,
+        responseIsValid: Object.keys(initialInvalidItems).length === 0
       }));
     },
     setUpdatableResponseAsPopulated: (populatedResponse: QuestionnaireResponse) => {
+      const sourceQuestionnaire = questionnaireStore.getState().sourceQuestionnaire;
       const formChanges = diff(get().updatableResponse, populatedResponse) ?? null;
+      const updatedInvalidItems = validateQuestionnaire({
+        questionnaire: sourceQuestionnaire,
+        questionnaireResponse: populatedResponse
+      });
       set(() => ({
         updatableResponse: populatedResponse,
         updatableResponseItems: createQuestionnaireResponseItemMap(populatedResponse),
-        formChangesHistory: [...get().formChangesHistory, formChanges]
+        formChangesHistory: [...get().formChangesHistory, formChanges],
+        invalidItems: updatedInvalidItems,
+        responseIsValid: Object.keys(updatedInvalidItems).length === 0
       }));
     },
     updateResponse: (updatedResponse: QuestionnaireResponse) => {
+      const sourceQuestionnaire = questionnaireStore.getState().sourceQuestionnaire;
       const formChanges = diff(get().updatableResponse, updatedResponse) ?? null;
+      const updatedInvalidItems = validateQuestionnaire({
+        questionnaire: sourceQuestionnaire,
+        questionnaireResponse: updatedResponse
+      });
       set(() => ({
         updatableResponse: updatedResponse,
         updatableResponseItems: createQuestionnaireResponseItemMap(updatedResponse),
-        formChangesHistory: [...get().formChangesHistory, formChanges]
+        formChangesHistory: [...get().formChangesHistory, formChanges],
+        invalidItems: updatedInvalidItems,
+        responseIsValid: Object.keys(updatedInvalidItems).length === 0
       }));
     },
-    setUpdatableResponseAsSaved: (savedResponse: QuestionnaireResponse) =>
+    setUpdatableResponseAsSaved: (savedResponse: QuestionnaireResponse) => {
+      const sourceQuestionnaire = questionnaireStore.getState().sourceQuestionnaire;
+      const updatedInvalidItems = validateQuestionnaire({
+        questionnaire: sourceQuestionnaire,
+        questionnaireResponse: savedResponse
+      });
+
       set(() => ({
         sourceResponse: savedResponse,
         updatableResponse: savedResponse,
         updatableResponseItems: createQuestionnaireResponseItemMap(savedResponse),
-        formChangesHistory: []
-      })),
-    setUpdatableResponseAsEmpty: (clearedResponse: QuestionnaireResponse) =>
+        formChangesHistory: [],
+        invalidItems: updatedInvalidItems,
+        responseIsValid: Object.keys(updatedInvalidItems).length === 0
+      }));
+    },
+    setUpdatableResponseAsEmpty: (clearedResponse: QuestionnaireResponse) => {
+      const sourceQuestionnaire = questionnaireStore.getState().sourceQuestionnaire;
+      const updatedInvalidItems = validateQuestionnaire({
+        questionnaire: sourceQuestionnaire,
+        questionnaireResponse: clearedResponse
+      });
+
       set(() => ({
         updatableResponse: clearedResponse,
         updatableResponseItems: createQuestionnaireResponseItemMap(clearedResponse),
-        formChangesHistory: []
-      })),
+        formChangesHistory: [],
+        invalidItems: updatedInvalidItems,
+        responseIsValid: Object.keys(updatedInvalidItems).length === 0
+      }));
+    },
     destroySourceResponse: () =>
       set(() => ({
         sourceResponse: cloneDeep(emptyResponse),
         updatableResponse: cloneDeep(emptyResponse),
         updatableResponseItems: createQuestionnaireResponseItemMap(cloneDeep(emptyResponse)),
-        formChangesHistory: []
+        formChangesHistory: [],
+        invalidItems: {},
+        responseIsValid: true
       }))
   })
 );
 
+/**
+ * QuestionnaireResponse state management store which contains all properties and methods to manage the state of the questionnaire.
+ * This is the React version of the store which can be used as React hooks in React functional components.
+ * @see {QuestionnaireResponseStoreType} for available properties and methods.
+ * @see {questionnaireResponseStore} for the vanilla store.
+ *
+ * @author Sean Fong
+ */
 export const useQuestionnaireResponseStore = createSelectors(questionnaireResponseStore);

package/src/stores/questionnaireStore.ts

@@ -25,7 +25,7 @@ import type {
 import type { Variables } from '../interfaces/variables.interface';
 import type { LaunchContext } from '../interfaces/populate.interface';
 import type { CalculatedExpression } from '../interfaces/calculatedExpression.interface';
-import type { EnableWhenExpressions, EnableWhenItems } from '../interfaces';
+import type { EnableWhenExpressions, EnableWhenItems } from '../interfaces/enableWhen.interface';
 import type { AnswerExpression } from '../interfaces/answerExpression.interface';
 import type { Tabs } from '../interfaces/tab.interface';
 import {
@@ -47,7 +47,47 @@ import { mutateRepeatEnableWhenExpressionInstances } from '../utils/enableWhenEx
 import { questionnaireResponseStore } from './questionnaireResponseStore';
 import { createQuestionnaireResponseItemMap } from '../utils/questionnaireResponseStoreUtils/updatableResponseItems';
 
-interface QuestionnaireStoreType {
+/**
+ * QuestionnaireStore properties and methods
+ * Properties can be accessed for fine-grain details.
+ * Methods are usually used internally, using them from an external source is not recommended.
+ *
+ * @property sourceQuestionnaire - FHIR R4 Questionnaire to render
+ * @property itemTypes - Key-value pair of item types `Record<linkId, item.type>`
+ * @property tabs - Key-value pair of tabs `Record<linkId, Tab>`
+ * @property currentTabIndex - Index of the current tab
+ * @property variables - Questionnaire variables object containing FHIRPath and x-fhir-query variables
+ * @property launchContexts - Key-value pair of launch contexts `Record<launch context name, launch context properties>`
+ * @property enableWhenItems - EnableWhenItems object containing enableWhen items and their linked questions
+ * @property enableWhenLinkedQuestions - Key-value pair of linked questions to enableWhen items `Record<linkId, linkIds of linked questions>`
+ * @property enableWhenIsActivated - Flag to turn enableWhen checks on/off
+ * @property enableWhenExpressions - EnableWhenExpressions object containing enableWhen expressions
+ * @property calculatedExpressions - Key-value pair of calculated expressions `Record<linkId, array of calculated expression properties>`
+ * @property answerExpressions - Key-value pair of answer expressions `Record<linkId, answer expression properties>`
+ * @property processedValueSetCodings - Key-value pair of processed value set codings `Record<valueSetUrl, codings>`
+ * @property processedValueSetUrls - Key-value pair of contained value set urls `Record<valueSetName, valueSetUrl>`
+ * @property cachedValueSetCodings - Key-value pair of cached value set codings `Record<valueSetUrl, codings>`
+ * @property fhirPathContext - Key-value pair of evaluated FHIRPath values `Record<variable name, evaluated value(s)>`
+ * @property populatedContext - Key-value pair of one-off pre-populated FHIRPath values `Record<variable/launchContext/sourceQueries batch name, evaluated value(s)>`
+ * @property focusedLinkId - LinkId of the currently focused item
+ * @property readOnly - Flag to set the form to read-only mode
+ * @method buildSourceQuestionnaire - Used to build the source questionnaire with the provided questionnaire and optionally questionnaire response, additional variables, terminology server url and readyOnly flag
+ * @method destroySourceQuestionnaire - Used to destroy the source questionnaire and reset all properties
+ * @method switchTab - Used to switch the current tab index
+ * @method markTabAsComplete - Used to mark a tab index as complete
+ * @method updateEnableWhenItem - Used to update linked enableWhen items by updating a question with a new answer
+ * @method mutateRepeatEnableWhenItems - Used to add or remove instances of repeating enableWhen items
+ * @method toggleEnableWhenActivation - Used to toggle enableWhen checks on/off
+ * @method updateExpressions - Used to update all SDC expressions based on the updated questionnaire response
+ * @method addCodingToCache - Used to add a coding to the cached value set codings
+ * @method updatePopulatedProperties - Used to update all SDC expressions based on a pre-populated questionnaire response
+ * @method onFocusLinkId - Used to set the focused linkId
+ * @method setPopulatedContext - Used to set the populated contexts (launchContext, sourceQueries, x-fhir-query vars) for debugging purposes
+ * @method setFormAsReadOnly - Used to set the form as read-only
+ *
+ * @author Sean Fong
+ */
+export interface QuestionnaireStoreType {
   sourceQuestionnaire: Questionnaire;
   itemTypes: Record<string, string>;
   tabs: Tabs;
@@ -97,8 +137,16 @@ interface QuestionnaireStoreType {
   ) => QuestionnaireResponse;
   onFocusLinkId: (linkId: string) => void;
   setPopulatedContext: (newPopulatedContext: Record<string, any>) => void;
+  setFormAsReadOnly: (readOnly: boolean) => void;
 }
 
+/**
+ * Questionnaire state management store which contains all properties and methods to manage the state of the questionnaire.
+ * This is the vanilla version of the store which can be used in non-React environments.
+ * @see {QuestionnaireStoreType} for available properties and methods.
+ *
+ * @author Sean Fong
+ */
 export const questionnaireStore = createStore<QuestionnaireStoreType>()((set, get) => ({
   sourceQuestionnaire: cloneDeep(emptyQuestionnaire),
   itemTypes: {},
@@ -349,7 +397,19 @@ export const questionnaireStore = createStore<QuestionnaireStoreType>()((set, ge
   setPopulatedContext: (newPopulatedContext: Record<string, any>) =>
     set(() => ({
       populatedContext: newPopulatedContext
+    })),
+  setFormAsReadOnly: (readOnly: boolean) =>
+    set(() => ({
+      readOnly: readOnly
     }))
 }));
 
+/**
+ * Questionnaire state management store which contains all properties and methods to manage the state of the questionnaire.
+ * This is the React version of the store which can be used as React hooks in React functional components.
+ * @see {QuestionnaireStoreType} for available properties and methods.
+ * @see {questionnaireStore} for the vanilla store.
+ *
+ * @author Sean Fong
+ */
 export const useQuestionnaireStore = createSelectors(questionnaireStore);

package/src/stores/smartConfigStore.ts

@@ -20,6 +20,22 @@ import type { Encounter, Patient, Practitioner } from 'fhir/r4';
 import type Client from 'fhirclient/lib/Client';
 import { createSelectors } from './selector';
 
+/**
+ * SmartConfigStore properties and methods
+ * Properties can be accessed for fine-grain details.
+ * Methods are usually used internally, using them from an external source is not recommended.
+ *
+ * @property client - The FHIRClient object (https://github.com/smart-on-fhir/client-js)
+ * @property patient - The patient resource in context
+ * @property user - The user resource in context
+ * @property encounter - The encounter resource in context
+ * @method setClient - Set the FHIRClient object when launching via SMART App Launch
+ * @method setPatient - Set the patient resource in context
+ * @method setUser - Set the user resource in context
+ * @method setEncounter - Set the encounter resource in context
+ *
+ * @author Sean Fong
+ */
 export interface SmartConfigStoreType {
   client: Client | null;
   patient: Patient | null;
@@ -31,6 +47,16 @@ export interface SmartConfigStoreType {
   setEncounter: (encounter: Encounter) => void;
 }
 
+/**
+ * Smart Config state management store. This is only used for answerExpressions.
+ * It is recommended to manage the state of the FHIRClient, patient, user, and encounter in the parent application, since the renderer doesn't provide pre-population capabilities.
+ * Will be deprecated in version 1.0.0.
+ *
+ * This is the vanilla version of the store which can be used in non-React environments.
+ * @see {SmartConfigStoreType} for available properties and methods.
+ *
+ * @author Sean Fong
+ */
 export const smartConfigStore = createStore<SmartConfigStoreType>()((set) => ({
   client: null,
   patient: null,
@@ -42,4 +68,15 @@ export const smartConfigStore = createStore<SmartConfigStoreType>()((set) => ({
   setEncounter: (encounter: Encounter) => set(() => ({ encounter: encounter }))
 }));
 
+/**
+ * Smart Config state management store. This is only used for answerExpressions.
+ * It is recommended to manage the state of the FHIRClient, patient, user, and encounter in the parent application, since the renderer doesn't provide pre-population capabilities.
+ * Will be deprecated in version 1.0.0.
+ *
+ * This is the React version of the store which can be used as React hooks in React functional components.
+ * @see {SmartConfigStoreType} for available properties and methods.
+ * @see {smartConfigStore} for the vanilla store.
+ *
+ * @author Sean Fong
+ */
 export const useSmartConfigStore = createSelectors(smartConfigStore);

package/src/stores/terminologyServerStore.ts

@@ -20,16 +20,43 @@ import { createSelectors } from './selector';
 
 const ONTOSERVER_R4 = 'https://r4.ontoserver.csiro.au/fhir';
 
-interface TerminologyServerStoreType {
+/**
+ * TerminologyServerStore properties and methods
+ * Properties can be accessed for fine-grain details.
+ * Methods are usually used internally, using them from an external source is not recommended.
+ *
+ * @property url - The current terminology server URL
+ * @method setUrl - Set the terminology server URL
+ * @method resetUrl - Reset the terminology server URL to the default
+ *
+ * @author Sean Fong
+ */
+export interface TerminologyServerStoreType {
   url: string;
   setUrl: (newUrl: string) => void;
   resetUrl: () => void;
 }
 
+/**
+ * Terminology server state management store. This is used for resolving valueSets externally.
+ * Defaults to use https://r4.ontoserver.csiro.au/fhir.
+ * This is the vanilla version of the store which can be used in non-React environments.
+ * @see {TerminologyServerStoreType} for available properties and methods.
+ *
+ * @author Sean Fong
+ */
 export const terminologyServerStore = createStore<TerminologyServerStoreType>()((set) => ({
   url: ONTOSERVER_R4,
   setUrl: (newUrl: string) => set(() => ({ url: newUrl })),
   resetUrl: () => set(() => ({ url: ONTOSERVER_R4 }))
 }));
 
+/**
+ * Terminology server state management store. This is used for resolving valueSets externally.
+ * Defaults to use https://r4.ontoserver.csiro.au/fhir.
+ * This is the React version of the store which can be used as React hooks in React functional components.
+ * @see {TerminologyServerStoreType} for available properties and methods.
+ *
+ * @author Sean Fong
+ */
 export const useTerminologyServerStore = createSelectors(terminologyServerStore);

package/src/stories/{BuildFormButtonForStorybook.tsx → StorybookWrappers/BuildFormButtonForStorybook.tsx}

@@ -17,20 +17,27 @@
 
 // @ts-ignore
 import React from 'react';
+import type { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
 import { Box, IconButton, Tooltip } from '@mui/material';
-import Iconify from '../components/Iconify/Iconify';
+import Iconify from '../../components/Iconify/Iconify';
+import { buildForm } from '../../utils';
 
 interface BuildFormButtonProps {
-  onBuild: () => void;
+  questionnaire: Questionnaire;
+  questionnaireResponse?: QuestionnaireResponse;
 }
 
 function BuildFormButtonForStorybook(props: BuildFormButtonProps) {
-  const { onBuild } = props;
+  const { questionnaire, questionnaireResponse } = props;
+
+  async function handleBuildForm() {
+    await buildForm(questionnaire, questionnaireResponse);
+  }
 
   return (
     <Box display="flex" mb={0.5} alignItems="center" columnGap={3}>
-      <Tooltip title="Build form" placement="right">
-        <IconButton onClick={onBuild} size="small" color="primary">
+      <Tooltip title="Build form with questionnaire response" placement="right">
+        <IconButton onClick={handleBuildForm} size="small" color="primary">
           <Iconify icon="ph:hammer" sx={{ mb: 0.5 }} />
         </IconButton>
       </Tooltip>

package/src/stories/StorybookWrappers/BuildFormButtonTesterWrapperForStorybook.tsx

@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+// @ts-ignore
+import React from 'react';
+import type { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
+import { BaseRenderer } from '../../components';
+import { QueryClientProvider } from '@tanstack/react-query';
+import { RendererThemeProvider } from '../../theme';
+import { useBuildForm, useRendererQueryClient } from '../../hooks';
+import BuildFormButtonForStorybook from './BuildFormButtonForStorybook';
+
+interface BuildFormButtonTesterWrapperForStorybookProps {
+  questionnaire: Questionnaire;
+  questionnaireResponse?: QuestionnaireResponse;
+}
+
+/**
+ * This is a demo wrapper which initialises the BaseRenderer with the passed in questionnaire using useBuildForm.
+ * It also provides a button to build the form with the passed in questionnaire + questionnaireResponse.
+ * It was done as a two-step process for demo purposes.
+ *
+ * Use this pattern if you already have a pre-populated/pre-filled/draft response.
+ * If you want to pre-pop on the fly, see https://github.com/aehrc/smart-forms/blob/main/packages/smart-forms-renderer/src/stories/StorybookWrappers/PrePopWrapperForStorybook.tsx instead
+ *
+ * @author Sean Fong
+ */
+function BuildFormButtonTesterWrapperForStorybook(
+  props: BuildFormButtonTesterWrapperForStorybookProps
+) {
+  const { questionnaire, questionnaireResponse } = props;
+
+  const queryClient = useRendererQueryClient();
+
+  const isBuilding = useBuildForm(questionnaire);
+
+  if (isBuilding) {
+    return <div>Loading...</div>;
+  }
+
+  return (
+    <RendererThemeProvider>
+      <QueryClientProvider client={queryClient}>
+        <div>
+          <BuildFormButtonForStorybook
+            questionnaire={questionnaire}
+            questionnaireResponse={questionnaireResponse}
+          />
+          <BaseRenderer />
+        </div>
+      </QueryClientProvider>
+    </RendererThemeProvider>
+  );
+}
+
+export default BuildFormButtonTesterWrapperForStorybook;

package/src/stories/{BuildFormWrapper.tsx → StorybookWrappers/BuildFormWrapperForStorybook.tsx}

@@ -18,35 +18,34 @@
 // @ts-ignore
 import React from 'react';
 import type { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
-import { BaseRenderer } from '../components';
+import { BaseRenderer } from '../../components';
 import { QueryClientProvider } from '@tanstack/react-query';
-import ThemeProvider from '../theme/Theme';
-import useQueryClient from '../hooks/useQueryClient';
-import useBuildFormForStorybook from './useBuildFormForStorybook';
+import RendererThemeProvider from '../../theme/Theme';
+import { useBuildForm } from '../../hooks';
+import useRendererQueryClient from '../../hooks/useRendererQueryClient';
 
-interface BuildFormWrapperProps {
+interface BuildFormWrapperForStorybookProps {
   questionnaire: Questionnaire;
   questionnaireResponse?: QuestionnaireResponse;
 }
 
-function BuildFormWrapper(props: BuildFormWrapperProps) {
+function BuildFormWrapperForStorybook(props: BuildFormWrapperForStorybookProps) {
   const { questionnaire, questionnaireResponse } = props;
 
-  const queryClient = useQueryClient();
-
-  const isBuilding = useBuildFormForStorybook(questionnaire, questionnaireResponse);
+  const queryClient = useRendererQueryClient();
+  const isBuilding = useBuildForm(questionnaire, questionnaireResponse);
 
   if (isBuilding) {
     return <div>Loading...</div>;
   }
 
   return (
-    <ThemeProvider>
+    <RendererThemeProvider>
       <QueryClientProvider client={queryClient}>
         <BaseRenderer />
       </QueryClientProvider>
-    </ThemeProvider>
+    </RendererThemeProvider>
   );
 }
 
-export default BuildFormWrapper;
+export default BuildFormWrapperForStorybook;

package/src/stories/{BuildFormButtonTesterWrapper.tsx → StorybookWrappers/FormValidationTesterWrapperForStorybook.tsx}

@@ -18,44 +18,47 @@
 // @ts-ignore
 import React from 'react';
 import type { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
-import { BaseRenderer } from '../components';
+import { BaseRenderer } from '../../components';
 import { QueryClientProvider } from '@tanstack/react-query';
-import ThemeProvider from '../theme/Theme';
-import useQueryClient from '../hooks/useQueryClient';
-import useBuildFormForStorybook from './useBuildFormForStorybook';
-import { buildForm } from '../utils';
-import BuildFormButtonForStorybook from './BuildFormButtonForStorybook';
+import { RendererThemeProvider } from '../../theme';
+import { useBuildForm, useRendererQueryClient } from '../../hooks';
+import { Grid } from '@mui/material';
+import FormValidationViewerForStorybook from './FormValidationViewerForStorybook';
 
-interface BuildFormButtonTesterWrapperProps {
+interface FormValidationTesterWrapperForStorybookProps {
   questionnaire: Questionnaire;
   questionnaireResponse?: QuestionnaireResponse;
 }
 
-function BuildFormButtonTesterWrapper(props: BuildFormButtonTesterWrapperProps) {
+function FormValidationTesterWrapperForStorybook(
+  props: FormValidationTesterWrapperForStorybookProps
+) {
   const { questionnaire, questionnaireResponse } = props;
 
-  const queryClient = useQueryClient();
+  const isBuilding = useBuildForm(questionnaire, questionnaireResponse);
 
-  const isBuilding = useBuildFormForStorybook(questionnaire);
-
-  async function handleBuildForm() {
-    await buildForm(questionnaire, questionnaireResponse);
-  }
+  const queryClient = useRendererQueryClient();
 
   if (isBuilding) {
     return <div>Loading...</div>;
   }
 
   return (
-    <ThemeProvider>
+    <RendererThemeProvider>
       <QueryClientProvider client={queryClient}>
         <div>
-          <BuildFormButtonForStorybook onBuild={handleBuildForm} />
-          <BaseRenderer />
+          <Grid container>
+            <Grid item xs={6}>
+              <BaseRenderer />
+            </Grid>
+            <Grid item xs={6}>
+              <FormValidationViewerForStorybook />
+            </Grid>
+          </Grid>
         </div>
       </QueryClientProvider>
-    </ThemeProvider>
+    </RendererThemeProvider>
   );
 }
 
-export default BuildFormButtonTesterWrapper;
+export default FormValidationTesterWrapperForStorybook;

package/src/stories/{useBuildFormForStorybook.ts → StorybookWrappers/FormValidationViewerForStorybook.tsx}

@@ -15,23 +15,14 @@
  * limitations under the License.
  */
 
-import { useLayoutEffect, useState } from 'react';
-import { buildForm } from '../utils';
-import type { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
+// @ts-ignore
+import React from 'react';
+import { useQuestionnaireResponseStore } from '../../stores';
 
-function useBuildFormForStorybook(
-  questionnaire: Questionnaire,
-  questionnaireResponse?: QuestionnaireResponse
-) {
-  const [isBuilding, setIsBuilding] = useState(true);
+function FormValidationViewerForStorybook() {
+  const invalidItems = useQuestionnaireResponseStore.use.invalidItems();
 
-  useLayoutEffect(() => {
-    buildForm(questionnaire, questionnaireResponse).then(() => {
-      setIsBuilding(false);
-    });
-  }, [questionnaire, questionnaireResponse]);
-
-  return isBuilding;
+  return <pre style={{ fontSize: 9 }}>{JSON.stringify(invalidItems, null, 2)}</pre>;
 }
 
-export default useBuildFormForStorybook;
+export default FormValidationViewerForStorybook;