Merge pull request #999 from joshunrau/fix-error

Author: joshunrau

apps/api/prisma/schema.prisma

@@ -190,9 +190,10 @@ model SessionModel {
 // Setup
 
 model SetupStateModel {
-  createdAt DateTime @default(now()) @db.Date
-  updatedAt DateTime @updatedAt @db.Date
-  id        String   @id @default(auto()) @map("_id") @db.ObjectId
-  isDemo    Boolean
-  isSetup   Boolean
+  createdAt                     DateTime @default(now()) @db.Date
+  updatedAt                     DateTime @updatedAt @db.Date
+  id                            String   @id @default(auto()) @map("_id") @db.ObjectId
+  isDemo                        Boolean
+  isExperimentalFeaturesEnabled Boolean?
+  isSetup                       Boolean
 }

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

@@ -1,4 +1,5 @@
 import { yearsPassed } from '@douglasneuroinformatics/libjs';
+import { reviver } from '@douglasneuroinformatics/libjs';
 import { linearRegression } from '@douglasneuroinformatics/libstats';
 import { Injectable, NotFoundException, UnprocessableEntityException } from '@nestjs/common';
 import type { Json, ScalarInstrument } from '@opendatacapture/runtime-core';
@@ -25,7 +26,6 @@ import { SubjectsService } from '@/subjects/subjects.service';
 import { VirtualizationService } from '@/virtualization/virtualization.service';
 
 import { InstrumentMeasuresService } from './instrument-measures.service';
-import { reviver } from '@douglasneuroinformatics/libjs';
 
 @Injectable()
 export class InstrumentRecordsService {
@@ -287,7 +287,7 @@ export class InstrumentRecordsService {
 
         const sessionId = session.id;
 
-        const revivedData: Json = JSON.parse(JSON.stringify(data), reviver);
+        const revivedData = JSON.parse(JSON.stringify(data), reviver) as Json;
 
         if (!instrument.validationSchema.safeParse(revivedData).success) {
           throw new UnprocessableEntityException(

apps/api/src/setup/dto/init-app.dto.ts

@@ -11,6 +11,9 @@ export class InitAppDto implements InitAppOptions {
   @ApiProperty()
   dummySubjectCount?: number;
 
+  @ApiProperty()
+  enableExperimentalFeatures: boolean;
+
   @ApiProperty()
   initDemo: boolean;
 

apps/api/src/setup/dto/update-setup-state.dto.ts

@@ -0,0 +1,10 @@
+import { ValidationSchema } from '@douglasneuroinformatics/libnest/core';
+import { ApiProperty } from '@nestjs/swagger';
+import { $UpdateSetupStateData } from '@opendatacapture/schemas/setup';
+import type { UpdateSetupStateData } from '@opendatacapture/schemas/setup';
+
+@ValidationSchema($UpdateSetupStateData)
+export class UpdateSetupStateDto implements UpdateSetupStateData {
+  @ApiProperty()
+  isExperimentalFeaturesEnabled?: boolean;
+}

apps/api/src/setup/setup.controller.ts

@@ -1,10 +1,11 @@
-import { Body, Controller, Get, Post } from '@nestjs/common';
+import { Body, Controller, Get, Patch, Post } from '@nestjs/common';
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import type { SetupState } from '@opendatacapture/schemas/setup';
 
 import { RouteAccess } from '@/core/decorators/route-access.decorator';
 
 import { InitAppDto } from './dto/init-app.dto';
+import { UpdateSetupStateDto } from './dto/update-setup-state.dto';
 import { SetupService } from './setup.service';
 
 @ApiTags('Setup')
@@ -34,4 +35,14 @@ export class SetupController {
   initApp(@Body() initAppDto: InitAppDto): Promise<{ success: boolean }> {
     return this.setupService.initApp(initAppDto);
   }
+
+  @ApiOperation({
+    description: 'Update the setup state',
+    summary: 'Update State'
+  })
+  @Patch()
+  @RouteAccess({ action: 'manage', subject: 'all' })
+  updateState(@Body() data: UpdateSetupStateDto): Promise<Partial<SetupState>> {
+    return this.setupService.updateState(data);
+  }
 }

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

@@ -1,6 +1,6 @@
-import { ForbiddenException, Injectable } from '@nestjs/common';
+import { ForbiddenException, Injectable, ServiceUnavailableException } from '@nestjs/common';
 import { type CreateAdminData } from '@opendatacapture/schemas/setup';
-import type { InitAppOptions, SetupState } from '@opendatacapture/schemas/setup';
+import type { InitAppOptions, SetupState, UpdateSetupStateData } from '@opendatacapture/schemas/setup';
 
 import { ConfigurationService } from '@/configuration/configuration.service';
 import { DemoService } from '@/demo/demo.service';
@@ -27,14 +27,15 @@ export class SetupService {
     const savedOptions = await this.getSavedOptions();
     return {
       isDemo: Boolean(savedOptions?.isDemo),
+      isExperimentalFeaturesEnabled: Boolean(savedOptions?.isExperimentalFeaturesEnabled),
       isGatewayEnabled: this.configurationService.get('GATEWAY_ENABLED'),
       isSetup: Boolean(savedOptions?.isSetup),
       release: __RELEASE__,
       uptime: Math.round(process.uptime())
     } satisfies SetupState;
   }
 
-  async initApp({ admin, dummySubjectCount, initDemo, recordsPerSubject }: InitAppOptions) {
+  async initApp({ admin, dummySubjectCount, enableExperimentalFeatures, initDemo, recordsPerSubject }: InitAppOptions) {
     const isDev = this.configurationService.get('NODE_ENV') === 'development';
     const savedOptions = await this.getSavedOptions();
     if (savedOptions?.isSetup && !isDev) {
@@ -48,10 +49,25 @@ export class SetupService {
         recordsPerSubject: recordsPerSubject ?? 0
       });
     }
-    await this.setupStateModel.create({ data: { isDemo: initDemo, isSetup: true } });
+    await this.setupStateModel.create({
+      data: { isDemo: initDemo, isExperimentalFeaturesEnabled: enableExperimentalFeatures, isSetup: true }
+    });
     return { success: true };
   }
 
+  async updateState(data: UpdateSetupStateData): Promise<Partial<SetupState>> {
+    const setupState = await this.getSavedOptions();
+    if (!setupState?.isSetup) {
+      throw new ServiceUnavailableException('Cannot update state before setup');
+    }
+    return this.setupStateModel.update({
+      data,
+      where: {
+        id: setupState.id
+      }
+    });
+  }
+
   private async getSavedOptions() {
     return await this.setupStateModel.findFirst();
   }

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

@@ -1 +1 @@
-declare var message: 'hello';
+declare let message: 'hello';

apps/playground/src/store/slices/editor.slice.ts

@@ -80,7 +80,7 @@ export const createEditorSlice: SliceCreator<EditorSlice> = (set, get) => ({
   },
   updateFile: (name, update) => {
     set((state) => {
-      let index = state.files.findIndex((file) => file.name === name);
+      const index = state.files.findIndex((file) => file.name === name);
       if (index === -1) {
         console.error(`Cannot update file '${name}': file does not exist`);
         return;

apps/playground/src/vim/adapter.ts

@@ -680,7 +680,7 @@ export default class EditorAdapter {
     let char = key;
     const pos = this.getPos_();
     let range = makeRange(pos.lineNumber, pos.column, pos.lineNumber, pos.column + 1);
-    let forceMoveMarkers = true;
+    const forceMoveMarkers = true;
 
     if (key.startsWith("'")) {
       char = key[1]!;

apps/playground/src/vim/default-key-map.ts

@@ -1,6 +1,6 @@
 import type { KeyMapping } from './types';
 
-export let defaultKeymap: KeyMapping[] = [
+export const defaultKeymap: KeyMapping[] = [
   // Key to key mapping. This goes first to make it possible to override
   // existing mappings.
   { keys: '<Left>', toKeys: 'h', type: 'keyToKey' },
@@ -838,4 +838,4 @@ export let defaultKeymap: KeyMapping[] = [
   { keys: ':', type: 'ex' }
 ];
 
-export let defaultKeymapLength = defaultKeymap.length;
+export const defaultKeymapLength = defaultKeymap.length;