From 2bb7d1e18621a4c85d3094296e46cc3fca8cce05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 23:41:54 +0000 Subject: [PATCH 1/3] Bump cookie and express in /documentation Bumps [cookie](https://github.com/jshttp/cookie) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together. Updates `cookie` from 0.6.0 to 0.7.1 - [Release notes](https://github.com/jshttp/cookie/releases) - [Commits](https://github.com/jshttp/cookie/compare/v0.6.0...v0.7.1) Updates `express` from 4.21.0 to 4.21.1 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.1/History.md) - [Commits](https://github.com/expressjs/express/compare/4.21.0...4.21.1) --- updated-dependencies: - dependency-name: cookie dependency-type: indirect - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] --- documentation/package-lock.json | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/documentation/package-lock.json b/documentation/package-lock.json index 0804189f..e908d1fa 100644 --- a/documentation/package-lock.json +++ b/documentation/package-lock.json @@ -52,9 +52,9 @@ } }, "node_modules/@aehrc/smart-forms-renderer": { - "version": "0.40.1", - "resolved": "https://registry.npmjs.org/@aehrc/smart-forms-renderer/-/smart-forms-renderer-0.40.1.tgz", - "integrity": "sha512-Y6AaGHCl+YP+Z8WOdsknXOAHTuW0PKWaoaZDlcazOIGfc0k17yfhkqnA+M0ycfkRUo+XJhY7A2WAHFZz1oW0pg==", + "version": "0.44.0", + "resolved": "https://registry.npmjs.org/@aehrc/smart-forms-renderer/-/smart-forms-renderer-0.44.0.tgz", + "integrity": "sha512-A80bYDLDBovDiXarvH3dlzxlzd2stiFEyBHrzF7zvlVdqIU/yS10zllMhJQsrxQ3/JPNk3j/5/C7h5MvHz8noA==", "dependencies": { "@aehrc/sdc-populate": "^2.3.1", "@iconify/react": "^4.1.1", @@ -68,6 +68,7 @@ "lodash.debounce": "^4.0.8", "lodash.difference": "^4.5.0", "lodash.intersection": "^4.4.0", + "lodash.isequal": "^4.5.0", "nanoid": "^5.0.7", "react-beautiful-dnd": "^13.1.1", "react-dnd": "^16.0.1", @@ -9834,9 +9835,9 @@ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "engines": { "node": ">= 0.6" } @@ -11827,16 +11828,16 @@ } }, "node_modules/express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -15699,6 +15700,11 @@ "resolved": "https://registry.npmjs.org/lodash.intersection/-/lodash.intersection-4.4.0.tgz", "integrity": "sha512-N+L0cCfnqMv6mxXtSPeKt+IavbOBBSiAEkKyLasZ8BVcP9YXQgxLO12oPR8OyURwKV8l5vJKiE1M8aS70heuMg==" }, + "node_modules/lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==" + }, "node_modules/lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", From ef45bf9428adbbd76308a62a869161989d9614d8 Mon Sep 17 00:00:00 2001 From: yeexianfong Date: Fri, 18 Oct 2024 09:52:05 +1100 Subject: [PATCH 2/3] Fix checkbox open label string input --- .../smart-forms-renderer/src/utils/openChoice.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/smart-forms-renderer/src/utils/openChoice.ts b/packages/smart-forms-renderer/src/utils/openChoice.ts index 21e4f824..878eacc0 100644 --- a/packages/smart-forms-renderer/src/utils/openChoice.ts +++ b/packages/smart-forms-renderer/src/utils/openChoice.ts @@ -106,10 +106,21 @@ export function updateOpenLabelAnswer( } // New open label answer is different from old open label answer, update it - oldOpenLabelAnswer.valueString = changedOpenLabelValue; + const updatedAnswers = oldQrItem.answer?.map((answer) => { + const { valueString } = answer; + if (valueString === oldOpenLabelAnswer.valueString) { + return { + ...answer, + valueString: changedOpenLabelValue // Update the valueString + }; + } + + return answer; // Keep the other answers unchanged + }); + return { ...oldQrItem, - answer: oldQrItem.answer + answer: updatedAnswers }; } From 2d66fccc0469ff0dc4149ee35e1d5591139224ed Mon Sep 17 00:00:00 2001 From: yeexianfong Date: Fri, 18 Oct 2024 10:07:23 +1100 Subject: [PATCH 3/3] Fix checkbox open label string input --- CHANGELOG.md | 3 +++ apps/smart-forms-app/package.json | 2 +- documentation/package.json | 2 +- package-lock.json | 6 +++--- packages/smart-forms-renderer/package.json | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e8ddb27..47f60131 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ This log documents significant changes for the [@aehrc/smart-forms-renderer](htt Changelog only includes changes from version 0.36.0 onwards. +## [0.44.2] - 2024-10-18 +### Fixed +- Fixed an issue where inputs in checkbox open-choice's open label field does not update the QuestionnaireResponse. ## [0.44.1] - 2024-10-14 ### Fixed diff --git a/apps/smart-forms-app/package.json b/apps/smart-forms-app/package.json index bd5bcc6a..2929191d 100644 --- 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.1", - "@aehrc/smart-forms-renderer": "^0.44.1", + "@aehrc/smart-forms-renderer": "^0.44.2", "@emotion/react": "^11.13.0", "@emotion/styled": "^11.13.0", "@fontsource/material-icons": "^5.0.18", diff --git a/documentation/package.json b/documentation/package.json index 7f6c60f1..2df0f20f 100644 --- a/documentation/package.json +++ b/documentation/package.json @@ -15,7 +15,7 @@ "typecheck": "tsc" }, "dependencies": { - "@aehrc/smart-forms-renderer": "^0.44.1", + "@aehrc/smart-forms-renderer": "^0.44.2", "@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 index 07923fe1..bfaf0aa8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "dependencies": { "@aehrc/sdc-assemble": "^1.3.1", "@aehrc/sdc-populate": "^2.3.1", - "@aehrc/smart-forms-renderer": "^0.44.0", + "@aehrc/smart-forms-renderer": "^0.44.2", "@emotion/react": "^11.13.0", "@emotion/styled": "^11.13.0", "@fontsource/material-icons": "^5.0.18", @@ -451,7 +451,7 @@ "name": "@aehrc/smart-forms-documentation", "version": "0.0.0", "dependencies": { - "@aehrc/smart-forms-renderer": "^0.44.0", + "@aehrc/smart-forms-renderer": "^0.44.2", "@docusaurus/core": "^3.4.0", "@docusaurus/preset-classic": "^3.4.0", "@docusaurus/theme-live-codeblock": "^3.4.0", @@ -39546,7 +39546,7 @@ }, "packages/smart-forms-renderer": { "name": "@aehrc/smart-forms-renderer", - "version": "0.44.0", + "version": "0.44.2", "license": "Apache-2.0", "dependencies": { "@aehrc/sdc-populate": "^2.3.1", diff --git a/packages/smart-forms-renderer/package.json b/packages/smart-forms-renderer/package.json index abb48957..0f2200b5 100644 --- 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.44.1", + "version": "0.44.2", "description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms", "main": "lib/index.js", "scripts": {