Merge branch 'DouglasNeuroInformatics:main' into large-upload-fix

Author: david-roper

.gitignore

@@ -59,5 +59,6 @@ testing/k6/notebooks/
 # autogenerated api docs
 apps/outreach/src/content/docs/en/runtime-core-docs/
 
-# mongodb
+# docker dbs
 mongo/
+sqlite/

apps/api/src/instruments/instruments.service.ts

@@ -164,8 +164,9 @@ export class InstrumentsService {
     options: EntityOperationOptions = {}
   ): Promise<InstrumentInfo[]> {
     const instances = await this.find(query, options);
-    return instances.map(({ __runtimeVersion, details, id, kind, language, tags }) => ({
+    return instances.map(({ __runtimeVersion, clientDetails, details, id, kind, language, tags }) => ({
       __runtimeVersion,
+      clientDetails,
       details,
       id,
       kind,

apps/api/src/setup/setup.service.ts

@@ -1,5 +1,4 @@
 import { ForbiddenException, Injectable, ServiceUnavailableException } from '@nestjs/common';
-import { getReleaseInfo } from '@opendatacapture/release-info';
 import { type CreateAdminData } from '@opendatacapture/schemas/setup';
 import type { InitAppOptions, SetupState, UpdateSetupStateData } from '@opendatacapture/schemas/setup';
 
@@ -31,7 +30,7 @@ export class SetupService {
       isExperimentalFeaturesEnabled: Boolean(savedOptions?.isExperimentalFeaturesEnabled),
       isGatewayEnabled: this.configurationService.get('GATEWAY_ENABLED'),
       isSetup: Boolean(savedOptions?.isSetup),
-      release: import.meta.release ?? (await getReleaseInfo()),
+      release: __RELEASE__,
       uptime: Math.round(process.uptime())
     } satisfies SetupState;
   }

apps/api/src/typings/global.d.ts

@@ -1,9 +1,5 @@
-/* eslint-disable @typescript-eslint/consistent-type-definitions */
-
 import type { ReleaseInfo } from '@opendatacapture/schemas/setup';
 
 declare global {
-  interface ImportMeta {
-    readonly release?: ReleaseInfo;
-  }
+  const __RELEASE__: ReleaseInfo;
 }

apps/gateway/Dockerfile

@@ -1,7 +1,7 @@
 FROM node:iron-alpine AS base
 WORKDIR /app
 ARG RELEASE_VERSION
-ENV GATEWAY_DATABASE_URL=file:/app/gateway.db
+ENV GATEWAY_DATABASE_URL=file:/app/sqlite/gateway.db
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 ENV NODE_OPTIONS="--max-old-space-size=8192"
@@ -25,12 +25,13 @@ RUN turbo run db:push --filter=@opendatacapture/gateway
 
 # RUN SERVER
 FROM base AS runner
-COPY --from=installer /app/gateway.db /app/gateway.db
+COPY apps/gateway/scripts/run.sh run.sh
+COPY --from=installer /app/sqlite/gateway.db /app/gateway.tmpl.db
 COPY --from=installer /app/apps/gateway/dist/ /app/dist/
 COPY --from=installer /app/apps/gateway/public/ /app/public/
 COPY --from=installer /app/apps/gateway/dist/runtime/ /runtime/
 COPY --from=installer /app/apps/gateway/dist/prisma/client/ /.prisma/client/
 
 RUN echo '{ "type": "module" }' > package.json
 RUN echo '{ "type": "module" }' > /runtime/package.json
-CMD [ "node", "./dist/main.js" ]
+CMD [ "./run.sh" ]

apps/gateway/scripts/run.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+DATABASE_FILE=${GATEWAY_DATABASE_URL#file:}
+EMPTY_DATABASE_FILE="/app/gateway.tmpl.db"
+
+if [[ ! -f "$DATABASE_FILE" ]]; then
+  cp "$EMPTY_DATABASE_FILE" "$DATABASE_FILE"
+fi
+
+node ./dist/main.js

apps/playground/package.json

@@ -6,7 +6,7 @@
   "license": "Apache-2.0",
   "scripts": {
     "build": "tsc && env-cmd -f ../../.env pnpm exec vite build",
-    "deploy": "rsync -r dist/* douglasneuroinformatics.ca:/home/unrjos/www/playground.opendatacapture.org",
+    "deploy": "rsync -r dist/* unrjos@cloud1.douglasneuroinformatics.ca:/home/unrjos/www/playground.opendatacapture.org",
     "dev": "NODE_ENV=development env-cmd -f ../../.env pnpm exec vite",
     "format": "prettier --write src",
     "lint": "tsc && eslint --fix src",

apps/playground/src/components/Editor/EditorPane.tsx

@@ -142,6 +142,7 @@ export const EditorPane = React.forwardRef<EditorPaneRef, EditorPaneProps>(funct
       options={{
         automaticLayout: true,
         codeLens: false,
+        colorDecorators: true,
         contextmenu: false,
         fixedOverflowWidgets: true,
         minimap: {
@@ -150,9 +151,13 @@ export const EditorPane = React.forwardRef<EditorPaneRef, EditorPaneProps>(funct
         quickSuggestions: true,
         quickSuggestionsDelay: 10,
         scrollBeyondLastLine: false,
+        showDeprecated: true,
         stickyScroll: {
           enabled: false
         },
+        suggest: {
+          showDeprecated: false
+        },
         suggestOnTriggerCharacters: true,
         tabCompletion: 'on',
         tabSize: 2

apps/playground/src/instruments/examples/form/Form-Reference/index.ts

@@ -188,11 +188,13 @@ export default defineInstrument({
       }
     }
   ],
+  clientDetails: {
+    estimatedDuration: 5,
+    instructions: ['Please complete all questions']
+  },
   details: {
     description: 'This example includes all possible static field variants',
     title: 'Reference Instrument',
-    estimatedDuration: 5,
-    instructions: ['Please complete all questions'],
     license: 'Apache-2.0'
   },
   measures: {},

apps/playground/src/instruments/examples/form/Form-With-Computed-Measures/index.ts

@@ -33,10 +33,12 @@ export default defineInstrument({
       variant: 'slider'
     }
   },
+  clientDetails: {
+    estimatedDuration: 1,
+    instructions: ['Please respond to all questions']
+  },
   details: {
     description: 'This is an example of a form with computed measures',
-    estimatedDuration: 1,
-    instructions: ['Please respond to all questions'],
     license: 'Apache-2.0',
     title: 'Happiness Questionnaire'
   },