Merge pull request #935 from aehrc/fix/calculated-expression

Fix/calculated expression
aehrc · Jul 23, 2024 · 3ffbd9d · 3ffbd9d
2 parents ca2a855 + c80e4cd
commit 3ffbd9d
Show file tree

Hide file tree

Showing 8 changed files with 287 additions and 84 deletions.
diff --git a/apps/smart-forms-app/package.json b/apps/smart-forms-app/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "@aehrc/sdc-assemble": "^1.3.1",
     "@aehrc/sdc-populate": "^2.3.0",
-    "@aehrc/smart-forms-renderer": "^0.36.0",
+    "@aehrc/smart-forms-renderer": "^0.36.1",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
     "@fontsource/material-icons": "^5.0.18",

diff --git a/documentation/package.json b/documentation/package.json
@@ -15,7 +15,7 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@aehrc/smart-forms-renderer": "^0.36.0",
+    "@aehrc/smart-forms-renderer": "^0.36.1",
     "@docusaurus/core": "^3.4.0",
     "@docusaurus/preset-classic": "^3.4.0",
     "@docusaurus/theme-live-codeblock": "^3.4.0",

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/smart-forms-renderer/package.json b/packages/smart-forms-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aehrc/smart-forms-renderer",
-  "version": "0.36.0",
+  "version": "0.36.1",
   "description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
   "main": "lib/index.js",
   "scripts": {

diff --git a/packages/smart-forms-renderer/src/hooks/useCodingCalculatedExpression.ts b/packages/smart-forms-renderer/src/hooks/useCodingCalculatedExpression.ts
@@ -16,7 +16,7 @@
  */
 
 import { useEffect, useState } from 'react';
-import type { QuestionnaireItem } from 'fhir/r4';
+import type { Coding, QuestionnaireItem } from 'fhir/r4';
 import { useQuestionnaireStore } from '../stores';
 
 interface UseCodingCalculatedExpression {
@@ -56,6 +56,7 @@ function useCodingCalculatedExpression(
         calcExpression.value !== valueInString &&
         (typeof calcExpression.value === 'string' ||
           typeof calcExpression.value === 'number' ||
+          typeof calcExpression.value === 'object' ||
           calcExpression.value === null)
       ) {
         // update ui to show calculated value changes
@@ -70,6 +71,14 @@ function useCodingCalculatedExpression(
           return;
         }
 
+        // calculatedExpression value is object, check if it is a Coding object
+        if (typeof calcExpression.value === 'object' && objectIsCoding(calcExpression.value)) {
+          if (calcExpression.value.code) {
+            onChangeByCalcExpressionString(calcExpression.value.code);
+            return;
+          }
+        }
+
         // calculatedExpression value is a string or number
         const newValueString =
           typeof calcExpression.value === 'string'
@@ -87,4 +96,8 @@ function useCodingCalculatedExpression(
   return { calcExpUpdated: calcExpUpdated };
 }
 
+function objectIsCoding(obj: any): obj is Coding {
+  return obj && obj.code && typeof obj.code === 'string';
+}
+
 export default useCodingCalculatedExpression;