Merge remote-tracking branch 'beda/calculated-test' into age-group-test

Author: roman-podrubny

.github/workflows/build_test_lint.yml

@@ -76,31 +76,6 @@ jobs:
           path: packages/smart-forms-app/coverage
           retention-days: 30
 
-  vitest-smart-forms-app-715-tests:
-    name: Vitest Questionnaire Behaviour Tests - Smart Forms App
-    runs-on: ubuntu-latest
-    # Run this regardless of "if: github.actor != 'dependabot[bot]'" condition on other jobs to see if dependabot PRs breaks the build
-    steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js 20.x
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: npm
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Build workspace packages (monorepo dependencies)
-        run: |
-          npm run build -w packages/sdc-assemble
-          npm run build -w packages/sdc-populate
-          npm run build -w packages/sdc-template-extract
-          npm run build -w packages/smart-forms-renderer
-
-      - name: Run vitest tests
-        run: npm run test-715 -w apps/smart-forms-app
-      - uses: codecov/codecov-action@v4
-
   jest-renderer-tests:
     name: Jest Tests - Renderer
     runs-on: ubuntu-latest

.github/workflows/vitest_715.yml

@@ -0,0 +1,28 @@
+name: Vitest Questionnaire 715 Behaviour Tests
+
+on: [workflow_dispatch]
+
+jobs:
+  vitest-smart-forms-app-715-tests:
+    name: Vitest Questionnaire Behaviour Tests - Smart Forms App
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: npm
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build workspace packages (monorepo dependencies)
+        run: |
+          npm run build -w packages/sdc-assemble
+          npm run build -w packages/sdc-populate
+          npm run build -w packages/sdc-template-extract
+          npm run build -w packages/smart-forms-renderer
+
+      - name: Run vitest tests
+        run: npm run test-715 -w apps/smart-forms-app
+      - uses: codecov/codecov-action@v4

CHANGELOG.md

@@ -10,6 +10,17 @@ For changelogs of other libraries, please refer to their respective repositories
 
 Changelog only includes changes from version 0.36.0 onwards.
 
+## [1.2.14] - 2026-03-05
+### Changed
+- Reduced vertical padding and margins to limit excessive whitespace in the renderer.
+- Changed standalone autocomplete fields to be multiline so that value is not truncated.
+### Fixed
+- Fixed regression causing some calculatedExpressions to not be displayed.
+
+## [1.2.13] - 2026-02-12
+### Fixed
+- Fixed an issue where existing QuestionnaireResponse repeat group items were being overwritten by blank data when applying calculatedExpression values, causing issue [#1811](https://github.com/aehrc/smart-forms/issues/1811)
+
 ## [1.2.12] - 2026-01-13
 ### Added
 - Added support for text styling on answerOption.valueString.

Dockerfile

@@ -1,26 +1,39 @@
+# Dockerfile
+# Runtime Configuration: This Docker image supports runtime configuration via config.json.
+# Mount your custom config.json at /usr/share/nginx/html/config.json to override defaults.
+# See config.docker.json for an example and the README for Kubernetes ConfigMap documentation.
 
-FROM node:20 AS build
-
+# Step 1: Use a Node.js image to build the app
+FROM --platform=$BUILDPLATFORM node:20 AS builder
 
+# Set working directory inside the container
+WORKDIR /app
 
+# Copy package files for dependency installation
+COPY package*.json ./
+COPY apps/smart-forms-app/package*.json ./apps/smart-forms-app/
 
-ARG VITE_ONTOSERVER_URL
-ARG VITE_FORMS_SERVER_URL
-ARG VITE_LAUNCH_SCOPE
-ARG VITE_LAUNCH_CLIENT_ID
-ARG VITE_IN_APP_POPULATE
-ARG VITE_PRESERVE_SYM_LINKS
+# Install dependencies
+RUN npm install
 
-ENV VITE_ONTOSERVER_URL $VITE_ONTOSERVER_URL
-ENV VITE_FORMS_SERVER_URL $VITE_FORMS_SERVER_URL
-ENV VITE_LAUNCH_SCOPE $VITE_LAUNCH_SCOPE
-ENV VITE_LAUNCH_CLIENT_ID $VITE_LAUNCH_CLIENT_ID
-ENV VITE_IN_APP_POPULATE $VITE_IN_APP_POPULATE
-ENV VITE_PRESERVE_SYM_LINKS $VITE_PRESERVE_SYM_LINKS
+# Copy the rest of the app's source code
+COPY . .
 
-RUN mkdir /app
-COPY . /app
-RUN ls /app
-WORKDIR /app
-RUN npm install
+# Build the app
 WORKDIR /app/apps/smart-forms-app
+RUN npm run build
+
+# Step 2: Use an Nginx image to serve the static files
+FROM nginx:alpine
+
+# Copy the build files from the builder stage to the Nginx web directory
+COPY --from=builder /app/apps/smart-forms-app/dist /usr/share/nginx/html
+
+# Copy your Nginx configuration file into the container
+COPY apps/smart-forms-app/default.conf /etc/nginx/conf.d/
+
+# Expose port 80
+EXPOSE 80
+
+# Start Nginx server
+CMD ["nginx", "-g", "daemon off;"]

LOCAL_DEVELOPMENT.md

@@ -498,29 +498,8 @@ P.S. We had `alpha` as a pre-release branch before the recent v1.0.0 release. Th
 9. Merge `main` into your branch to ensure you have the latest changes.
 10. Update TypeDoc documentation by running `npm run build` in `/documentation`.
 11. Request for a code review from a team member (or review it yourself). Once approved, you can proceed to the next steps.
-12. If you are working on a package (i.e. any package in `/packages`), follow the steps below to publish a new version. Otherwise, merge your branch into `main`.
-13. Depending on which package/app you are working on, bump the version number in `package.json` following [semantic versioning](https://semver.org/) principles.
-14. Update dependencies in other packages/apps if necessary.
-    - `@aehrc/smart-forms-renderer`'s Storybook depends on `@aehrc/sdc-populate` and `@aehrc/sdc-template-extract`. If you update `@aehrc/sdc-populate` or `@aehrc/sdc-template-extract`, make sure to bump their versions and the `@aehrc/smart-forms-renderer` version.
-    - For example, if you are making changes to `@aehrc/sdc-populate`, ensure that:
-      - Both the Renderer's and Smart Forms app's dependency on `@aehrc/sdc-populate` is updated to the new version.
-      - `@aehrc/smart-forms-renderer`'s version is also bumped to reflect the dependency change.
-      - Bump `@aehrc/smart-forms-renderer`'s dependency version in Smart Forms app's `package.json`.
-15. Run `npm install` to update package-lock.json with the new version.
-16. Run `npm run build` in the respective package directory to ensure you get the latest build output.
-    - If updating multiple packages, make sure to run the build command in each of the respective folders.
-17. Run `npm publish` in the respective package directory to publish new versions to NPM.
-    - If updating multiple packages, make sure to run the publish command in each of the respective folders.
-    - You might need to go through NPM 2FA when publishing new versions. Ensure you are logged into NPM with the correct account that has publishing rights on the aehrc organisation.
-18. Create a new entry in the `CHANGELOG.md` file in the respective package/app directory summarising your changes. 
-    - @aehrc/smart-forms-renderer - https://github.com/aehrc/smart-forms/blob/main/CHANGELOG.md
-    - @aehrc/sdc-populate - https://github.com/aehrc/smart-forms/blob/main/packages/sdc-populate/CHANGELOG.md
-    - @aehrc/sdc-assemble - https://github.com/aehrc/smart-forms/blob/main/packages/sdc-assemble/CHANGELOG.md
-    - @aehrc/sdc-template-extract - https://github.com/aehrc/smart-forms/blob/main/packages/sdc-template-extract/CHANGELOG.md
-19. Push a new commit with the version bumps and changelog updates.
-20. Ensure that all CI checks pass (build, tests, linting, etc.).
-21. Merge your branch into `main`.
-22. Ensure the CI passes on `main` after the merge. If you added any Storybook stories or if story layout in Chromatic changes, those have to be reviewed and approved in Chromatic.
+12. Merge your branch into `main`.
+13. Ensure the CI passes on `main` after the merge. If you added any Storybook stories or if story layout in Chromatic changes, those have to be reviewed and approved in Chromatic.
 
 > Remember to merge main into your branch regularly throughout the development process.
 
@@ -540,7 +519,31 @@ P.S. We had `alpha` as a pre-release branch before the recent v1.0.0 release. Th
 13. For the reviewing internal team member:
     - Review the code changes.
     - Once approved, merge the pull request into `aehrc/main`.
-    - If there are package version bumps, create a new PR referencing the issue and follow the steps from step 13 onwards in [Contributing workflow - internal contributors](#contributing-workflow---internal-contributors) to publish new package versions.
+    - If there are package version bumps, create a new PR referencing the issue and follow the steps in [Release process](#release-process) to publish new package versions.
+
+## Release process
+1. Create a release branch from main (e.g. `release/<date>`).
+2. Update the `CHANGELOG.md` file in the respective package/app directory summarising changes since the last release. 
+    - @aehrc/smart-forms-renderer - https://github.com/aehrc/smart-forms/blob/main/CHANGELOG.md
+    - @aehrc/sdc-populate - https://github.com/aehrc/smart-forms/blob/main/packages/sdc-populate/CHANGELOG.md
+    - @aehrc/sdc-assemble - https://github.com/aehrc/smart-forms/blob/main/packages/sdc-assemble/CHANGELOG.md
+    - @aehrc/sdc-template-extract - https://github.com/aehrc/smart-forms/blob/main/packages/sdc-template-extract/CHANGELOG.md
+3. Depending on which package/app you are working on, bump the version number in `package.json` following [semantic versioning](https://semver.org/) principles.
+4. Update dependencies in other packages/apps if necessary.
+    - `@aehrc/smart-forms-renderer`'s Storybook depends on `@aehrc/sdc-populate` and `@aehrc/sdc-template-extract`. If you update `@aehrc/sdc-populate` or `@aehrc/sdc-template-extract`, make sure to bump their versions and the `@aehrc/smart-forms-renderer` version.
+    - For example, if you are making changes to `@aehrc/sdc-populate`, ensure that:
+      - Both the Renderer's and Smart Forms app's dependency on `@aehrc/sdc-populate` is updated to the new version.
+      - `@aehrc/smart-forms-renderer`'s version is also bumped to reflect the dependency change.
+      - Bump `@aehrc/smart-forms-renderer`'s dependency version in Smart Forms app's `package.json`.
+5. Run `npm install` to update package-lock.json with the new version.
+6. Push a new commit with the version bumps and changelog updates.
+7. Open and merge a PR from the release branch into main.
+8. Ensure that all CI checks pass (build, tests, linting, etc.).
+9. Run `npm run build` in the respective package directory to ensure you get the latest build output.
+    - If updating multiple packages, make sure to run the build command in each of the respective folders.
+10. Publish to NPM from main after merge by running `npm publish` in the respective package directory.
+    - If updating multiple packages, make sure to run the publish command in each of the respective folders.
+    - You might need to go through NPM 2FA when publishing new versions. Ensure you are logged into NPM with the correct account that has publishing rights on the aehrc organisation.
 
 ## Dependency notes
 - `date-fns` with version "^4.1.0" in `apps/smart-forms-app/package.json` is not used in the source code. It is used to prevent CommonJS issues when building the Smart Forms app in docker.

apps/smart-forms-app/jest.config.ts

@@ -23,7 +23,7 @@ const config: Config = {
   preset: 'ts-jest',
   testEnvironment: 'jsdom',
   testPathIgnorePatterns: [
-    'src/test/aboriginalForm*.test.tsx' // Exclude this specific test file (it uses Vitest)
+    'src/test/aboriginalForm.*\\.test\\.tsx' // Exclude these test files (regex) (it uses Vitest)
   ],
   setupFilesAfterEnv: ['./src/setup-jest.ts'],
   transform: {

apps/smart-forms-app/package.json

@@ -29,7 +29,7 @@
     "@aehrc/sdc-assemble": "^2.0.2",
     "@aehrc/sdc-populate": "^4.6.2",
     "@aehrc/sdc-template-extract": "^1.0.15",
-    "@aehrc/smart-forms-renderer": "^1.2.12",
+    "@aehrc/smart-forms-renderer": "^1.2.14",
     "@dnd-kit/core": "^6.3.1",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",

apps/smart-forms-app/public/config.json

@@ -3,5 +3,6 @@
   "formsServerUrl": "https://smartforms.csiro.au/api/fhir",
   "defaultClientId": "a57d90e3-5f69-4b92-aa2e-2992180863c1",
   "launchScopes": "launch openid fhirUser online_access patient/AllergyIntolerance.cs patient/Condition.cs patient/Encounter.r patient/Immunization.cs patient/Medication.r patient/MedicationStatement.cs patient/Observation.cs patient/Patient.r patient/QuestionnaireResponse.crus user/Practitioner.r launch/questionnaire?role=http://ns.electronichealth.net.au/smart/role/new",
-  "registeredClientIdsUrl": "https://smartforms.csiro.au/smart-config/config.json"
+  "registeredClientIdsUrl": "https://smartforms.csiro.au/smart-config/config.json",
+  "showDeveloperMessages": true
 }

apps/smart-forms-app/src/api/saveQr.ts

@@ -52,7 +52,7 @@ export async function saveProgress(
   user: Practitioner,
   questionnaire: Questionnaire,
   questionnaireResponse: QuestionnaireResponse,
-  saveStatus: 'in-progress' | 'completed'
+  saveStatus: 'in-progress' | 'completed' | 'amended'
 ) {
   const responseToSave = removeEmptyAnswersFromResponse(
     questionnaire,

apps/smart-forms-app/src/data/resources/Questionnaire/Questionnaire-AboriginalTorresStraitIslanderHealthCheckAssembled-0.4.0.json

@@ -270,9 +270,7 @@
       "resourceType": "ValueSet",
       "id": "administrative-gender",
       "meta": {
-        "profile": [
-          "http://hl7.org/fhir/StructureDefinition/shareablevalueset"
-        ]
+        "profile": ["http://hl7.org/fhir/StructureDefinition/shareablevalueset"]
       },
       "extension": [
         {
@@ -3489,9 +3487,7 @@
   "title": "NEW!!! Aboriginal and Torres Strait Islander Health Check",
   "status": "draft",
   "experimental": false,
-  "subjectType": [
-    "Patient"
-  ],
+  "subjectType": ["Patient"],
   "date": "2025-03-14",
   "publisher": "AEHRC CSIRO",
   "contact": [
@@ -22514,4 +22510,4 @@
       ]
     }
   ]
-}
+}