Otter 51 researcher step 2

src/app/researcher/studies/page.tsx

@@ -1,7 +1,7 @@
 import { db } from '@/database'
 import { Container, Flex, Button, Paper, Title, Group, Alert, Anchor } from '@mantine/core'
 import Link from '../../../../node_modules/next/link'
-import { b64toUUID } from '@/lib/uuid'
+import { uuidToB64 } from '@/lib/uuid'
 import { studyRowStyle, studyStatusStyle, studyTitleStyle } from './styles.css'
 import { humanizeStatus } from '@/lib/status'
 
@@ -41,9 +41,9 @@ export default async function StudyReviewPage() {
                                     <p className={studyTitleStyle}>{study.title}</p>
                                     <p>{study.piName}</p>
                                     <p className={studyStatusStyle}>{humanizeStatus(study.status)}</p>
-                                    <Link href={`/researcher/study/${b64toUUID(study.id)}/review`}>
-                                        <Anchor>Proceed to review ≫</Anchor>
-                                    </Link>
+                                    <Anchor component={Link} href={`/researcher/study/${uuidToB64(study.id)}/review`}>
+                                        Proceed to review ≫
+                                    </Anchor>
                                 </li>
                             ))}
                         </ul>

src/app/researcher/study/[encodedStudyId]/edit/schema.ts

@@ -5,8 +5,8 @@ import { zodResolver } from 'mantine-form-zod-resolver'
 const schema = z
     .object({
         title: z.string().min(3).max(100),
-        description: z.string().min(3).max(100),
-        piName: z.string().min(3).max(100),
+        description: z.string().min(3).max(500),
+        piName: z.string().min(3).max(1500),
         highlights: z.boolean().nullish(), // .preprocess((value) => value === 'on', z.boolean()).nullish(),
         eventCapture: z.boolean().nullish(),
         outputMimeType: z.string().nullish(),

src/app/researcher/study/[encodedStudyId]/review/page.tsx

@@ -1,6 +1,6 @@
 import { Paper, Center, Title, Stack, Group } from '@mantine/core'
 import { db } from '@/database'
-import { uuidToB64 } from '@/lib/uuid'
+import { b64toUUID } from '@/lib/uuid'
 import { StudyPanel } from './panel'
 import { AlertNotFound } from '@/components/errors'
 import { ResearcherBreadcrumbs } from '@/components/page-breadcrumbs'
@@ -15,7 +15,7 @@ export default async function StudyReviewPage({
     const study = await db
         .selectFrom('study')
         .selectAll()
-        .where('id', '=', uuidToB64(encodedStudyId))
+        .where('id', '=', b64toUUID(encodedStudyId))
         .executeTakeFirst()
 
     if (!study) {

src/app/researcher/study/[encodedStudyId]/review/results.tsx

@@ -11,9 +11,11 @@ import { DataTable } from 'mantine-datatable'
 import { fetchRunResultsAction } from './actions'
 import { ErrorAlert } from '@/components/errors'
 import { IconDownload } from '@tabler/icons-react'
+import { slugify } from '@/lib/string'
 
 type RunResultsProps = {
     run: { id: string }
+    study: { title: string }
 }
 
 const ViewCSV: FC<RunResultsProps> = ({ run }) => {
@@ -48,7 +50,7 @@ const ViewCSV: FC<RunResultsProps> = ({ run }) => {
 
     return (
         <DataTable
-            height={'calc(100vh - 200px)'}
+            height={'calc(100vh - 250px)'}
             idAccessor={'INDEX_KEY_FOR_RENDERING'}
             withTableBorder={false}
             withColumnBorders={false}
@@ -58,7 +60,7 @@ const ViewCSV: FC<RunResultsProps> = ({ run }) => {
     )
 }
 
-export const PreviewCSVResultsBtn: FC<RunResultsProps> = ({ run }) => {
+export const PreviewCSVResultsBtn: FC<RunResultsProps> = ({ run, study }) => {
     const [opened, { open, close }] = useDisclosure(false)
 
     return (
@@ -68,7 +70,7 @@ export const PreviewCSVResultsBtn: FC<RunResultsProps> = ({ run }) => {
                 onClose={close}
                 size="100%"
                 title={
-                    <Link href={`/dl/results/${uuidToB64(run.id)}`}>
+                    <Link href={`/dl/results/${uuidToB64(run.id)}/${slugify(study.title)}.csv`}>
                         <Button rightSection={<IconDownload size={14} />}>Download Results</Button>
                     </Link>
                 }
@@ -79,7 +81,7 @@ export const PreviewCSVResultsBtn: FC<RunResultsProps> = ({ run }) => {
                 }}
                 centered
             >
-                <ViewCSV run={run} />
+                <ViewCSV run={run} study={study} />
             </Modal>
 
             <Button variant="outline" onClick={open}>

src/app/researcher/study/[encodedStudyId]/review/runs-table.tsx

@@ -12,7 +12,7 @@ import {
     Group,
     Center,
 } from '@mantine/core'
-import { useDisclosure } from '@mantine/hooks'
+
 import { PushInstructions } from '@/components/push-instructions'
 import { IconPlus } from '@tabler/icons-react'
 import { useQuery, useQueryClient, useMutation } from '@tanstack/react-query'
@@ -38,12 +38,12 @@ type RunsTableProps = {
 
 const RunsTable: React.FC<RunsTableProps> = ({ isActive, study }) => {
     const queryClient = useQueryClient()
-    const [__, setViewingRunId] = useState<string | null>(null)
+    const [openedRunId, setOpened] = useState<string | false>(false)
 
     const { mutate: insertRun } = useMutation({
         mutationFn: () => onStudyRunCreateAction(study.id),
         onSuccess: async (runId) => {
-            setViewingRunId(runId)
+            setOpened(runId)
             await queryClient.invalidateQueries({ queryKey: ['runsForStudy', study.id] })
         },
     })
@@ -54,8 +54,6 @@ const RunsTable: React.FC<RunsTableProps> = ({ isActive, study }) => {
         queryFn: () => onFetchStudyRunsAction(study.id),
     })
 
-    const [opened, { open, close }] = useDisclosure(false)
-
     if (isPending) return <p>Loading...</p>
 
     return (
@@ -79,18 +77,38 @@ const RunsTable: React.FC<RunsTableProps> = ({ isActive, study }) => {
                             <Table.Td>{run.startedAt?.toISOString() || ''}</Table.Td>
                             <Table.Td align="right">
                                 <Group>
+                                    <>
+                                        <Modal
+                                            size={800}
+                                            opened={opened}
+                                            onClose={close}
+                                            title="AWS Instructions"
+                                            centered
+                                        >
+                                            <PushInstructions
+                                                containerLocation={study.containerLocation}
+                                                runId={run.id}
+                                            />
+                                        </Modal>
+                                        <Button onClick={open}>View Instructions</Button>
+                                    </>
                                     {run.status == 'INITIATED' && (
                                         <>
-                                            <Modal opened={opened} onClose={close} title="AWS Instructions" centered>
+                                            <Modal
+                                                opened={!!openedRunId}
+                                                onClose={() => setOpened(false)}
+                                                title="AWS Instructions"
+                                                centered
+                                            >
                                                 <PushInstructions
                                                     containerLocation={study.containerLocation}
                                                     runId={run.id}
                                                 />
                                             </Modal>
-                                            <Button onClick={open}>View Instructions</Button>
+                                            <Button onClick={() => setOpened(run.id)}>View Instructions</Button>
                                         </>
                                     )}
-                                    {run.status == 'COMPLETED' && <PreviewCSVResultsBtn run={run} />}
+                                    {run.status == 'COMPLETED' && <PreviewCSVResultsBtn run={run} study={study} />}
                                 </Group>
                             </Table.Td>
                         </Table.Tr>

src/app/researcher/study/request/[memberIdentifier]/actions.ts

@@ -7,6 +7,7 @@ import { db } from '@/database'
 import { uuidToB64 } from '@/lib/uuid'
 import { v7 as uuidv7 } from 'uuid'
 import { onStudyRunCreateAction } from '@/app/researcher/studies/actions'
+import { strToAscii } from '@/lib/string'
 
 export const onCreateStudyAction = async (memberId: string, study: FormValues) => {
     schema.parse(study) // throws when malformed
@@ -25,7 +26,7 @@ export const onCreateStudyAction = async (memberId: string, study: FormValues) =
 
     if (USING_CONTAINER_REGISTRY) {
         repoUrl = await createAnalysisRepository(repoPath, {
-            title: study.title,
+            title: strToAscii(study.title),
             studyId,
         })
     } else {

src/lib/paths.ts

@@ -1,24 +1,5 @@
 import type { MinimalRunInfo, MinimalRunResultsInfo } from '@/lib/types'
 import { uuidToB64 } from './uuid'
-// // https://dense13.com/blog/2009/05/03/converting-string-to-slug-javascript/
-export function slugify(str: string) {
-    str = str.replace(/^\s+|\s+$/g, '') // trim
-    str = str.toLowerCase()
-
-    // remove accents, swap ñ for n, etc
-    var from = 'àáäâèéëêìíïîòóöôùúüûñç·/_,:;'
-    var to = 'aaaaeeeeiiiioooouuuunc------'
-    for (var i = 0, l = from.length; i < l; i++) {
-        str = str.replace(new RegExp(from.charAt(i), 'g'), to.charAt(i))
-    }
-
-    str = str
-        .replace(/[^a-z0-9 -]/g, '') // remove invalid chars
-        .replace(/\s+/g, '-') // collapse whitespace and replace by -
-        .replace(/-+/g, '-') // collapse dashes
-
-    return str.slice(0, 50)
-}
 
 export const pathForStudyRun = (parts: MinimalRunInfo) =>
     `analysis/${parts.memberIdentifier}/${parts.studyId}/${parts.studyRunId}`

src/lib/string.ts

@@ -0,0 +1,23 @@
+export function strToAscii(str: string) {
+    return str.replace(/[^\x00-\x7F]/g, '')
+}
+
+// https://dense13.com/blog/2009/05/03/converting-string-to-slug-javascript/
+export function slugify(str: string) {
+    str = str.replace(/^\s+|\s+$/g, '') // trim
+    str = str.toLowerCase()
+
+    // remove accents, swap ñ for n, etc
+    var from = 'àáäâèéëêìíïîòóöôùúüûñç·/_,:;'
+    var to = 'aaaaeeeeiiiioooouuuunc------'
+    for (var i = 0, l = from.length; i < l; i++) {
+        str = str.replace(new RegExp(from.charAt(i), 'g'), to.charAt(i))
+    }
+
+    str = str
+        .replace(/[^a-z0-9 -]/g, '') // remove invalid chars
+        .replace(/\s+/g, '-') // collapse whitespace and replace by -
+        .replace(/-+/g, '-') // collapse dashes
+
+    return str.slice(0, 50)
+}

src/server/aws.ts

@@ -3,18 +3,22 @@ import { S3Client, GetObjectCommand } from '@aws-sdk/client-s3'
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
 import { Upload } from '@aws-sdk/lib-storage'
 import { ECRClient, CreateRepositoryCommand, SetRepositoryPolicyCommand } from '@aws-sdk/client-ecr'
-import { TEST_ENV } from './config'
+import { AWS_ACCOUNT_ENVIRONMENT, TEST_ENV } from './config'
 import { fromIni } from '@aws-sdk/credential-providers'
-import { slugify, pathForStudyRun, pathForStudyRunResults } from '@/lib/paths'
+import { strToAscii, slugify } from '@/lib/string'
+import { pathForStudyRun, pathForStudyRunResults } from '@/lib/paths'
 import { uuidToB64 } from '@/lib/uuid'
 import { Readable } from 'stream'
 import { createHash } from 'crypto'
 import { CodeManifest, MinimalRunInfo, MinimalRunResultsInfo } from '@/lib/types'
 import { getECRPolicy } from './aws-ecr-policy'
 
-const DEFAULT_TAGS: Record<string, string> = {
-    Environment: 'sandbox',
-    Target: 'si:analysis',
+export function objectToAWSTags(tags: Record<string, string>) {
+    const Environment = AWS_ACCOUNT_ENVIRONMENT[process.env.AWS_ACCOUNT_ID || ''] || 'Unknown'
+    return Object.entries({ ...tags, Environment, Application: 'Mangement App' }).map(([Key, Value]) => ({
+        Key,
+        Value: strToAscii(Value).slice(0, 256),
+    }))
 }
 
 let _ecrClient: ECRClient | null = null
@@ -70,7 +74,7 @@ export async function createAnalysisRepository(repositoryName: string, tags: Rec
     const resp = await ecrClient.send(
         new CreateRepositoryCommand({
             repositoryName,
-            tags: Object.entries(Object.assign(tags, DEFAULT_TAGS)).map(([Key, Value]) => ({ Key, Value })),
+            tags: objectToAWSTags({ ...tags, Target: 'si:analysis' }),
         }),
     )
     if (!resp?.repository?.repositoryUri) {
@@ -105,10 +109,7 @@ export const storeResultsFile = async (info: MinimalRunResultsInfo, body: Readab
     const hash = await calculateChecksum(csStream)
     const uploader = new Upload({
         client: getS3Client(),
-        tags: [
-            { Key: 'studyId', Value: info.studyId },
-            { Key: 'runId', Value: info.studyRunId },
-        ],
+        tags: objectToAWSTags({ studyId: info.studyId, runId: info.studyRunId }),
         params: {
             Bucket: s3BucketName(),
             ChecksumSHA256: hash,

src/server/config.ts

@@ -21,3 +21,10 @@ export const ENCLAVE_AWS_ACCOUNT_NUMBERS = [
     '084375557107', // dev
     '354918363956', // sandbox
 ]
+
+export const AWS_ACCOUNT_ENVIRONMENT: Record<string, string> = {
+    '533267019973': 'Production',
+    '867344442985': 'Staging',
+    '905418271997': 'Sandbox',
+    '872515273917': 'Development',
+}