Merge pull request #1151 from joshunrau/david

fix:  #1150

Author: joshunrau

.env.template

@@ -90,6 +90,8 @@ API_BASE_URL=http://localhost:5500
 VITE_DEV_NETWORK_LATENCY=0
 # Whether to force clear queries when the pathname changes
 VITE_DEV_FORCE_CLEAR_QUERY_CACHE=false
+# Whether to disable tutorial in dev mode
+VITE_DEV_DISABLE_TUTORIAL=false
 # Plausable analytics config (optional, set both to an empty string to disable)
 PLAUSIBLE_BASE_URL=
 PLAUSIBLE_WEB_DATA_DOMAIN=

apps/web/src/config.ts

@@ -10,6 +10,7 @@ const $Config = z.object({
     })
     .optional(),
   dev: z.object({
+    disableTutorial: $BooleanString.optional(),
     isBypassAuthEnabled: $BooleanString.optional(),
     isForceClearQueryCacheEnabled: $BooleanString.optional(),
     networkLatency: z.coerce.number().int().nonnegative().optional(),
@@ -38,6 +39,7 @@ export const config = await $Config
           }
         : undefined,
     dev: {
+      disableTutorial: import.meta.env.VITE_DEV_DISABLE_TUTORIAL,
       isBypassAuthEnabled: import.meta.env.VITE_DEV_BYPASS_AUTH,
       isForceClearQueryCacheEnabled: import.meta.env.VITE_DEV_FORCE_CLEAR_QUERY_CACHE,
       networkLatency: import.meta.env.VITE_DEV_NETWORK_LATENCY,

apps/web/src/hooks/useInstrumentRecords.ts

@@ -1,3 +1,4 @@
+import { reviver } from '@douglasneuroinformatics/libjs';
 import { $InstrumentRecord } from '@opendatacapture/schemas/instrument-records';
 import type { InstrumentRecordQueryParams } from '@opendatacapture/schemas/instrument-records';
 import { useQuery } from '@tanstack/react-query';
@@ -18,7 +19,8 @@ export const useInstrumentRecords = (
     enabled,
     queryFn: async () => {
       const response = await axios.get('/v1/instrument-records', {
-        params
+        params,
+        transformResponse: [(data: string) => JSON.parse(data, reviver) as unknown]
       });
       return $InstrumentRecord.array().parseAsync(response.data);
     },

apps/web/src/providers/WalkthroughProvider.tsx

@@ -12,6 +12,7 @@ import type { NavigateOptions } from 'react-router-dom';
 import { match } from 'ts-pattern';
 import type { Promisable } from 'type-fest';
 
+import { config } from '@/config';
 import type { StartSessionFormData } from '@/features/session/components/StartSessionForm';
 import { useIsDesktop } from '@/hooks/useIsDesktop';
 import { useAppStore } from '@/store';
@@ -429,7 +430,7 @@ export const WalkthroughProvider: React.FC<{ children: React.ReactElement }> = (
   const isDesktop = useIsDesktop();
 
   useEffect(() => {
-    if (isDisclaimerAccepted && !isWalkthroughComplete) {
+    if (isDisclaimerAccepted && !isWalkthroughComplete && !(import.meta.env.DEV && config.dev.disableTutorial)) {
       setIsWalkthroughOpen(true);
     }
   }, [isDisclaimerAccepted, isWalkthroughComplete]);

apps/web/src/vite-env.d.ts

@@ -3,6 +3,7 @@
 // All of these should be undefined in production
 interface ImportMetaDevEnv {
   readonly VITE_DEV_BYPASS_AUTH?: string;
+  readonly VITE_DEV_DISABLE_TUTORIAL?: string;
   readonly VITE_DEV_FORCE_CLEAR_QUERY_CACHE?: string;
   readonly VITE_DEV_NETWORK_LATENCY?: string;
   readonly VITE_DEV_PASSWORD?: string;