Merge branch 'main' into subject-id-fix

Author: david-roper

apps/api/Dockerfile

@@ -31,4 +31,4 @@ COPY --from=installer /app/apps/api/dist/runtime/ /runtime/
 RUN echo '{ "type": "module", "imports": { "#runtime/v1/*": "./dist/runtime/v1/*" } }' > package.json
 RUN echo '{ "type": "module" }' > /runtime/package.json
 USER node
-CMD [ "node", "./dist/app.js" ]
+CMD [ "node", "--enable-source-maps", "./dist/app.js" ]

apps/api/package.json

@@ -17,7 +17,7 @@
   "dependencies": {
     "@douglasneuroinformatics/libcrypto": "catalog:",
     "@douglasneuroinformatics/libjs": "catalog:",
-    "@douglasneuroinformatics/libnest": "^5.3.0",
+    "@douglasneuroinformatics/libnest": "^5.3.1",
     "@douglasneuroinformatics/libpasswd": "catalog:",
     "@douglasneuroinformatics/libstats": "catalog:",
     "@faker-js/faker": "^9.4.0",

apps/api/src/instrument-records/instrument-records.service.ts

@@ -4,6 +4,7 @@ import type { Model } from '@douglasneuroinformatics/libnest';
 import { linearRegression } from '@douglasneuroinformatics/libstats';
 import { Injectable, UnprocessableEntityException } from '@nestjs/common';
 import type { ScalarInstrument } from '@opendatacapture/runtime-core';
+import { DEFAULT_GROUP_NAME } from '@opendatacapture/schemas/core';
 import type {
   CreateInstrumentRecordData,
   InstrumentRecord,
@@ -158,6 +159,8 @@ export class InstrumentRecordsService {
           sessionId: record.session.id,
           sessionType: record.session.type,
           subjectAge: record.subject.dateOfBirth ? yearsPassed(record.subject.dateOfBirth) : null,
+          // eslint-disable-next-line perfectionist/sort-objects
+          groupId: record.subject.groupIds[0] ?? DEFAULT_GROUP_NAME,
           subjectId: record.subject.id,
           subjectSex: record.subject.sex,
           timestamp: record.date.toISOString(),

apps/web/src/features/session/components/StartSessionForm/StartSessionForm.tsx

@@ -3,6 +3,7 @@
 import { Form } from '@douglasneuroinformatics/libui/components';
 import { useTranslation } from '@douglasneuroinformatics/libui/hooks';
 import type { FormTypes } from '@opendatacapture/runtime-core';
+import { DEFAULT_GROUP_NAME } from '@opendatacapture/schemas/core';
 import type { Group } from '@opendatacapture/schemas/group';
 import { $SessionType } from '@opendatacapture/schemas/session';
 import type { CreateSessionData } from '@opendatacapture/schemas/session';
@@ -253,7 +254,7 @@ export const StartSessionForm = ({ currentGroup, initialValues, readOnly, onSubm
           });
         } else {
           subjectId = encodeScopedSubjectId(subjectId, {
-            groupName: currentGroup?.name ?? 'root'
+            groupName: currentGroup?.name ?? DEFAULT_GROUP_NAME
           });
         }
         await onSubmit({

package.json

@@ -1,7 +1,7 @@
 {
   "name": "opendatacapture",
   "type": "module",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "private": true,
   "packageManager": "[email protected]",
   "license": "Apache-2.0",

packages/schemas/src/core/core.ts

@@ -6,6 +6,8 @@ import type { Json, JsonLiteral, Language } from '@opendatacapture/runtime-core'
 import type { Simplify } from 'type-fest';
 import { z } from 'zod';
 
+export const DEFAULT_GROUP_NAME = 'root';
+
 export type AppAction = z.infer<typeof $AppAction>;
 export const $AppAction = z.enum(['create', 'delete', 'manage', 'read', 'update']);
 

packages/schemas/src/instrument-records/instrument-records.ts

@@ -45,6 +45,7 @@ export const $InstrumentRecord = $BaseModel.extend({
 export type InstrumentRecord = z.infer<typeof $InstrumentRecord>;
 
 export type InstrumentRecordsExport = {
+  groupId: string;
   instrumentEdition: number;
   instrumentName: string;
   measure: string;