Merge pull request #1053 from joshunrau/cpp-mvp

Author: joshunrau

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/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'
   },

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

@@ -91,15 +91,17 @@ export default defineInstrument({
       }
     }
   ],
-  details: {
-    description: {
-      en: 'This is an example of a multilingual grouped form',
-      fr: 'Voici un exemple de formulaire groupé multilingue'
-    },
+  clientDetails: {
     estimatedDuration: 1,
     instructions: {
       en: ['Please respond to all questions'],
       fr: ['Veuillez répondre à toutes les questions']
+    }
+  },
+  details: {
+    description: {
+      en: 'This is an example of a multilingual grouped form',
+      fr: 'Voici un exemple de formulaire groupé multilingue'
     },
     license: 'Apache-2.0',
     title: {

apps/playground/src/instruments/examples/form/Multilingual-Form-With-Dynamic-Field/index.ts

@@ -53,15 +53,17 @@ export default defineInstrument({
       }
     }
   },
-  details: {
-    description: {
-      en: 'This is an example of a simple form with conditional rendering and validation logic',
-      fr: 'Voici un exemple de formulaire simple avec un rendu conditionnel et une logique de validation'
-    },
+  clientDetails: {
     estimatedDuration: 1,
     instructions: {
       en: ['Please respond to all questions'],
       fr: ['Veuillez répondre à toutes les questions']
+    }
+  },
+  details: {
+    description: {
+      en: 'This is an example of a simple form with conditional rendering and validation logic',
+      fr: 'Voici un exemple de formulaire simple avec un rendu conditionnel et une logique de validation'
     },
     license: 'Apache-2.0',
     title: {

apps/playground/src/instruments/examples/interactive/Interactive-With-CSS/index.ts

@@ -31,10 +31,12 @@ export default defineInstrument({
       });
     }
   },
+  clientDetails: {
+    estimatedDuration: 1,
+    instructions: ['<PLACEHOLDER>']
+  },
   details: {
     description: '<PLACEHOLDER>',
-    estimatedDuration: 1,
-    instructions: ['<PLACEHOLDER>'],
     license: 'UNLICENSED',
     title: '<PLACEHOLDER>'
   },

apps/playground/src/instruments/examples/interactive/Interactive-With-JSPsych/index.ts

@@ -12,6 +12,10 @@ import orange from './orange.png';
 import '/runtime/v1/[email protected]/css/jspsych.css';
 
 export default defineInstrument({
+  clientDetails: {
+    estimatedDuration: 1,
+    instructions: ['The user will be displayed instructions on the screen']
+  },
   content: {
     async render(done) {
       const jsPsych = initJsPsych({
@@ -116,8 +120,6 @@ export default defineInstrument({
   },
   details: {
     description: 'This reaction time task is a non-trivial proof of concept with jspsych.',
-    estimatedDuration: 1,
-    instructions: ['The user will be displayed instructions on the screen'],
     license: 'MIT',
     title: 'Reaction Time Task'
   },

apps/playground/src/instruments/examples/interactive/Interactive-With-Legacy-Script/index.ts

@@ -23,10 +23,12 @@ export default defineInstrument({
       });
     }
   },
+  clientDetails: {
+    estimatedDuration: 1,
+    instructions: ['Please complete the task.']
+  },
   details: {
     description: 'This is an example of how ancient scripts, that fail in strict mode, can be used in an instrument.',
-    estimatedDuration: 1,
-    instructions: ['Please complete the task.'],
     license: 'Apache-2.0',
     title: 'Interactive Instrument With Legacy Script'
   },