feat: wip

.gitignore

@@ -42,3 +42,5 @@ docker/pgdata/
 
 # Next.js
 next-env.d.ts
+
+apps/web/public/uploads

apps/web/src/actions/datasets/create.ts

@@ -4,7 +4,7 @@ import { createDataset } from '@latitude-data/core/services/datasets/create'
 import disk from '$/lib/disk'
 import { z } from 'zod'
 
-import { withProject } from '../procedures'
+import { authProcedure } from '../procedures'
 
 const ACCEPTED_FILE_TYPES = [
   'text/csv',
@@ -15,12 +15,12 @@ const ACCEPTED_FILE_TYPES = [
 const MAX_SIZE = 3
 const MAX_UPLOAD_SIZE_IN_MB = 3 * 1024 * 1024
 
-export const createDatasetAction = withProject
+export const createDatasetAction = authProcedure
   .createServerAction()
   .input(
     z.object({
       name: z.string().min(1, { message: 'Name is required' }),
-      file: z
+      dataset_file: z
         .instanceof(File)
         .refine((file) => {
           return !file || file.size <= MAX_UPLOAD_SIZE_IN_MB
@@ -38,7 +38,7 @@ export const createDatasetAction = withProject
       disk: disk,
       data: {
         name: input.name,
-        file: input.file,
+        file: input.dataset_file,
       },
     })
 

apps/web/src/app/(private)/datasets/new/page.tsx

@@ -14,12 +14,11 @@ import useLatitudeAction from '$/hooks/useLatitudeAction'
 import { useNavigate } from '$/hooks/useNavigate'
 import { ROUTES } from '$/services/routes'
 
-// import useProjects from '$/stores/projects'
-
 export default function NewDataset() {
   const data = { name: '' }
   const navigate = useNavigate()
-  const { executeFormAction } = useLatitudeAction(createDatasetAction)
+  const { error, executeFormAction } = useLatitudeAction(createDatasetAction)
+  const errors = error?.fieldErrors
   return (
     <Modal
       open
@@ -42,16 +41,17 @@ export default function NewDataset() {
       >
         <FormWrapper>
           <Input
-            required
             type='text'
             label='Name'
             name='name'
+            errors={errors?.name}
             defaultValue={data?.name}
             placeholder='Amazing dataset'
           />
           <DropzoneInput
             label='Upload dataset'
             name='dataset_file'
+            errors={errors?.dataset_file}
             placeholder='Upload csv'
             multiple={false}
             accept='.csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel'

apps/web/src/hooks/useLatitudeAction.ts

@@ -36,8 +36,6 @@ export default function useLatitudeAction<
   const errorCb = useCallback(
     onError ||
       ((error: inferServerActionError<TServerAction>) => {
-        console.error(error)
-
         if (error?.err?.code === 'INPUT_PARSE_ERROR') return
 
         toast({

apps/web/src/lib/disk.ts

@@ -9,6 +9,6 @@ const DIRNAME_PATH = path.dirname(fileURLToPath(import.meta.url))
 export default new DiskWrapper({
   local: {
     publicPath: PUBLIC_PATH,
-    location: path.join(DIRNAME_PATH, `../../apps/web/public/${PUBLIC_PATH}`),
+    location: path.join(DIRNAME_PATH, `../../public/${PUBLIC_PATH}`),
   },
 })

packages/core/src/lib/disk.ts

@@ -7,9 +7,8 @@ import { FSDriver } from 'flydrive/drivers/fs'
 import { S3Driver } from 'flydrive/drivers/s3'
 import { WriteOptions } from 'flydrive/types'
 
-const generateUrl = (publicPath: string) => async (key: string) => {
-  ;`/${publicPath}/${key}`
-}
+const generateUrl = (publicPath: string) => async (key: string) =>
+  `/${publicPath}/${key}`
 
 function getAwsCredentials() {
   const accessKeyId = env.AWS_ACCESS_KEY

packages/core/src/services/datasets/create.ts

@@ -31,7 +31,7 @@ export const createDataset = async (
 
   const name = slugify(data.name)
   const extension = path.extname(data.file.name)
-  const fileName = `workspaces/${workspace.id}/datasets/${name}.${extension}`
+  const fileName = `workspaces/${workspace.id}/datasets/${name}${extension}`
 
   const diskResult = await disk.putFile(fileName, data.file)
 

packages/env/src/index.ts

@@ -33,7 +33,6 @@ if (environment !== 'production') {
   dotenv.config({ path: pathToEnv })
 }
 
-export const DriveDiskSchema = z.union([z.literal('local'), z.literal('s3')])
 export const env = createEnv({
   skipValidation:
     process.env.BUILDING_CONTAINER == 'true' || process.env.NODE_ENV === 'test',
@@ -45,13 +44,12 @@ export const env = createEnv({
     REDIS_PASSWORD: z.string().optional(),
     LATITUDE_URL: z.string().url(),
     MAILER_API_KEY: z.string().optional(),
-    FROM_MAILER_EMAIL: z.string(),
-    LATITUDE_DOMAIN: z.string(),
+    FROM_MAILER_EMAIL: z.string(), LATITUDE_DOMAIN: z.string(),
     AWS_REGION: z.string().optional(),
     S3_BUCKET: z.string().optional(),
     AWS_ACCESS_KEY: z.string().optional(),
     AWS_ACCESS_SECRET: z.string().optional(),
-    DRIVE_DISK: DriveDiskSchema,
+    DRIVE_DISK: z.union([z.literal('local'), z.literal('s3')])
   },
   runtimeEnv: process.env,
 })

packages/web-ui/src/ds/atoms/DropzoneInput/index.tsx

@@ -23,7 +23,6 @@ export function DropzoneInput({
   const ref = useRef<HTMLInputElement>(null)
   const onClickZone = useCallback(() => {
     if (!ref.current) return
-    console.log('File input ref', ref.current)
 
     ref.current.click()
   }, [ref])

packages/web-ui/src/ds/atoms/Input/index.tsx

@@ -47,6 +47,7 @@ const Input = forwardRef<HTMLInputElement, InputProps>(function Input(
       {...props}
     />
   )
+
   if (props.hidden) return inputComp
 
   return (