resolve #1213 and #1193

src/GlobalConfigParser.tsx

@@ -55,7 +55,7 @@ function HomeRoute({ globalConfig }: { globalConfig: GlobalConfig }) {
         padding="md"
         header={{ height: 70 }}
       >
-        <AppHeader studyIds={globalConfig.configsList} />
+        <AppHeader studyIds={globalConfig.configsList} studyConfigs={studyConfigs} />
         <ConfigSwitcher
           globalConfig={globalConfig}
           studyConfigs={studyConfigs}

src/analysis/individualStudy/StudyAnalysisTabs.tsx

@@ -377,7 +377,7 @@ export function StudyAnalysisTabs({ globalConfig }: { globalConfig: GlobalConfig
 
   return (
     <>
-      <AppHeader studyIds={globalConfig.configsList} selectedStudyId={displayStudyId} studyHref={routeStudyId ? `/${routeStudyId}` : undefined} />
+      <AppHeader studyIds={globalConfig.configsList} selectedStudyId={displayStudyId} studyHref={routeStudyId ? `/${routeStudyId}` : undefined} studyConfigs={studyConfig && displayStudyId ? { [displayStudyId]: studyConfig } : undefined} />
       <AppShell.Main style={{ height: '100dvh' }}>
         <Stack ref={ref} style={{ height: '100%', maxHeight: '100dvh', overflow: 'hidden' }} justify="space-between">
           <Flex direction="row" align="center" justify="space-between" p="sm" gap="md">

src/analysis/interface/AppHeader.tsx

@@ -1,26 +1,34 @@
 import {
-  Flex, Image, Select, Title, Space, Grid, AppShell, Button,
+  Flex, Image, Select, Title, Space, Grid, AppShell, Button, Text,
 } from '@mantine/core';
 
 import { useLocation, useNavigate, useParams } from 'react-router';
 
 import { IconListCheck, IconSettings } from '@tabler/icons-react';
 import { PREFIX } from '../../utils/Prefix';
 
+const STUDY_SCHEMA_VERSION_REGEX = /\/study\/(v\d+\.\d+\.\d+)\//;
+
 export function AppHeader({
   studyIds,
   selectedStudyId,
   studyHref,
+  studyConfigs,
 }: {
   studyIds: string[];
   selectedStudyId?: string;
   studyHref?: string;
+  studyConfigs?: Record<string, { $schema: string } | null>;
 }) {
   const navigate = useNavigate();
   const { studyId } = useParams();
   const location = useLocation();
 
   const selectorData = studyIds.map((id) => ({ value: id, label: id })).sort((a, b) => a.label.localeCompare(b.label));
+  const revisitVersion = studyIds
+    .map((id) => studyConfigs?.[id]?.$schema.match(STUDY_SCHEMA_VERSION_REGEX)?.[1])
+    .filter((version): version is string => version !== undefined)
+    .sort((a, b) => b.localeCompare(a, undefined, { numeric: true }))[0];
 
   const inAnalysis = location.pathname.includes('analysis');
 
@@ -39,6 +47,7 @@ export function AppHeader({
 
         <Grid.Col span={6}>
           <Flex
+            align="center"
             justify="flex-end"
             direction="row"
           >
@@ -58,7 +67,8 @@ export function AppHeader({
               </>
             )}
 
-            <IconSettings onClick={() => navigate('/settings')} style={{ cursor: 'pointer', marginTop: inAnalysis ? 6 : undefined }} />
+            {revisitVersion && <Text c="dimmed" size="sm" mr="sm">{`reVISit ${revisitVersion}`}</Text>}
+            <IconSettings onClick={() => navigate('/settings')} style={{ cursor: 'pointer' }} />
           </Flex>
         </Grid.Col>
       </Grid>

src/components/downloader/DownloadTidy.tsx

@@ -49,6 +49,7 @@ const OPTIONAL_COMMON_PROPS = [
   'responseMin',
   'responseMax',
   'configHash',
+  'metaData',
 ] as const;
 
 const REQUIRED_PROPS = [
@@ -109,6 +110,7 @@ function participantDataToRows(
   const newHeaders = new Set<string>();
   const participantConditions = parseConditionParam(participant.conditions ?? participant.searchParams?.condition);
   const conditionValue = participantConditions.length > 0 ? participantConditions.join(',') : 'default';
+  const metaData = JSON.stringify(participant.metadata);
 
   return [[
     {
@@ -120,6 +122,15 @@ function participantDataToRows(
       ...(properties.includes('condition') ? { condition: conditionValue } : {}),
       ...(properties.includes('stage') ? { stage: participant.stage } : {}),
     },
+    ...(properties.includes('metaData') ? [{
+      participantId: participant.participantId,
+      trialId: 'metaData',
+      trialOrder: null,
+      responseId: 'metaData',
+      answer: metaData,
+      ...(properties.includes('condition') ? { condition: conditionValue } : {}),
+      ...(properties.includes('stage') ? { stage: participant.stage } : {}),
+    }] : []),
     ...Object.values(participant.answers).map((trialAnswer) => {
       // Get the whole component, including the base component if there is inheritance
       const trialId = trialAnswer.componentName;
@@ -282,7 +293,9 @@ async function getTableData(
     const legacyStudyCondition = (p as { studyCondition?: string | string[] }).studyCondition;
     return parseConditionParam(p.conditions ?? legacyStudyCondition ?? p.searchParams?.condition).length > 0;
   });
-  const header = combinedProperties.filter((p) => p !== 'condition' || hasCondition);
+  const header = combinedProperties
+    .filter((p) => p !== 'condition' || hasCondition)
+    .filter((p) => p !== 'metaData');
   const allData = await Promise.all(data.map(async (participant) => {
     const partDataToRows = await participantDataToRows(participant, combinedProperties, allConfigs[participant.participantConfigHash], transcripts);