finish add enrollment from seat:wqs

This commit is contained in:
2026-01-27 23:13:36 -03:00
parent ecd91dbc5e
commit 6d0d006bb0
9 changed files with 395 additions and 247 deletions

View File

@@ -46,12 +46,15 @@ export const workspaceMiddleware = async (
const user = context.get(userContext)!
const cacheKey = buildWorkspaceCacheKey(request, user.sub, orgId)
const cached = await getWorkspaceFromCache(cacheKey)
if (cached) {
context.set(workspaceContext, cached)
return next()
}
try {
const cached = await getWorkspaceFromCache(cacheKey)
if (cached) {
context.set(workspaceContext, cached)
return next()
}
} catch {}
console.log(`[${new Date().toISOString()}] [${requestId}] Cache miss`)

View File

@@ -7,13 +7,7 @@ import {
CheckIcon,
ChevronsUpDownIcon
} from 'lucide-react'
import {
forwardRef,
use,
useMemo,
useState,
type InputHTMLAttributes
} from 'react'
import { forwardRef, useMemo, useState, type InputHTMLAttributes } from 'react'
import { Button } from '@repo/ui/components/ui/button'
import {
@@ -45,7 +39,7 @@ interface CoursePickerProps extends Omit<
'value' | 'onChange'
> {
value?: Course
options: Promise<{ hits: any[] }>
options: any[]
onChange?: (value: any) => void
error?: any
}
@@ -59,12 +53,11 @@ const normalize = (value: string) =>
export const CoursePicker = forwardRef<HTMLInputElement, CoursePickerProps>(
({ value, onChange, options, error, ...props }, ref) => {
const { hits } = use(options)
const [search, setSearch] = useState<string>('')
const [open, { set }] = useToggle()
const [sort, { toggle }] = useToggle('a-z', 'z-a')
const fuse = useMemo(() => {
return new Fuse(hits, {
return new Fuse(options, {
keys: ['name'],
threshold: 0.3,
includeMatches: true,
@@ -73,11 +66,11 @@ export const CoursePicker = forwardRef<HTMLInputElement, CoursePickerProps>(
return typeof value === 'string' ? normalize(value) : value
}
})
}, [hits])
}, [options])
const filtered = useMemo(() => {
if (!search) {
return [...hits].sort((a, b) => {
return [...options].sort((a, b) => {
const comparison = a.name.localeCompare(b.name)
return sort === 'a-z' ? comparison : -comparison
})
@@ -87,7 +80,7 @@ export const CoursePicker = forwardRef<HTMLInputElement, CoursePickerProps>(
...item,
matches
}))
}, [search, fuse, hits, sort])
}, [search, fuse, options, sort])
return (
<Popover open={open} onOpenChange={set}>
@@ -149,13 +142,15 @@ export const CoursePicker = forwardRef<HTMLInputElement, CoursePickerProps>(
name,
access_period,
metadata__unit_price: unit_price,
quantity = null
quantity = null,
disabled = false
}) => {
return (
<CommandItem
key={id}
value={id}
className="cursor-pointer"
disabled={disabled}
onSelect={() => {
onChange?.({
id,

View File

@@ -4,6 +4,7 @@ import { z } from 'zod'
export const MAX_ITEMS = 50
export const enrollment = z.object({
id: z.uuidv4().optional(),
user: z
.object(
{
@@ -34,7 +35,8 @@ export const enrollment = z.object({
scheduled_for: z
.date()
.optional()
.transform((date) => (date ? format(date, 'yyyy-MM-dd') : undefined))
.transform((date) => (date ? format(date, 'yyyy-MM-dd') : undefined)),
seat: z.object({ order_id: z.uuidv4() }).optional()
})
export const formSchema = z.object({

View File

@@ -131,8 +131,9 @@ export async function action({ params, request, context }: Route.ActionArgs) {
}
export default function Route({
loaderData: { courses, submission }
loaderData: { courses: courses_, submission }
}: Route.ComponentProps) {
const { hits: courses } = use(courses_)
const { orgid } = useParams()
const { enrolled } = use(submission)
const fetcher = useFetcher()

View File

@@ -1,48 +1,48 @@
import { Fragment, useEffect } from 'react'
import {
Trash2Icon,
PlusIcon,
CircleQuestionMarkIcon,
ArrowRightIcon
} from 'lucide-react'
import { useForm, useFieldArray, Controller, useWatch } from 'react-hook-form'
import { useParams } from 'react-router'
import { ErrorMessage } from '@hookform/error-message'
import { zodResolver } from '@hookform/resolvers/zod'
import { z } from 'zod'
import { DateTime } from 'luxon'
import { Form } from '@repo/ui/components/ui/form'
import {
InputGroup,
InputGroupAddon,
InputGroupInput
} from '@repo/ui/components/ui/input-group'
ArrowRightIcon,
CircleQuestionMarkIcon,
PlusIcon,
Trash2Icon
} from 'lucide-react'
import { DateTime } from 'luxon'
import { Fragment, use, useEffect } from 'react'
import { Controller, useFieldArray, useForm, useWatch } from 'react-hook-form'
import { useParams } from 'react-router'
import { z } from 'zod'
import { Button } from '@repo/ui/components/ui/button'
import { Separator } from '@repo/ui/components/ui/separator'
import { Kbd } from '@repo/ui/components/ui/kbd'
import { Spinner } from '@repo/ui/components/ui/spinner'
import { Form } from '@repo/ui/components/ui/form'
import {
HoverCard,
HoverCardContent,
HoverCardTrigger
} from '@repo/ui/components/ui/hover-card'
import { TZ } from '@/conf'
import {
MAX_ITEMS,
InputGroup,
InputGroupAddon,
InputGroupInput
} from '@repo/ui/components/ui/input-group'
import { Kbd } from '@repo/ui/components/ui/kbd'
import { Separator } from '@repo/ui/components/ui/separator'
import { Spinner } from '@repo/ui/components/ui/spinner'
import { useWizard } from '@/components/wizard'
import { TZ } from '@/conf'
import { CoursePicker } from '../_.$orgid.enrollments.add/course-picker'
import {
formSchema,
MAX_ITEMS,
type Course,
type User
} from '../_.$orgid.enrollments.add/data'
import { ScheduledForInput } from '../_.$orgid.enrollments.add/scheduled-for'
import { Cell } from '../_.$orgid.enrollments.add/route'
import { CoursePicker } from '../_.$orgid.enrollments.add/course-picker'
import { ScheduledForInput } from '../_.$orgid.enrollments.add/scheduled-for'
import { UserPicker } from '../_.$orgid.enrollments.add/user-picker'
import { Summary } from './bulk'
import { currency } from './utils'
import { useWizard } from '@/components/wizard'
import { useWizardStore } from './store'
import { currency } from './utils'
const emptyRow = {
user: undefined,
@@ -56,8 +56,9 @@ type AssignedProps = {
courses: Promise<{ hits: Course[] }>
}
export function Assigned({ courses }: AssignedProps) {
export function Assigned({ courses: courses_ }: AssignedProps) {
const wizard = useWizard()
const { hits: courses } = use(courses_)
const { orgid } = useParams()
const { update, ...state } = useWizardStore()
const form = useForm({
@@ -76,7 +77,7 @@ export function Assigned({ courses }: AssignedProps) {
}
})
const { formState, control, handleSubmit, setValue } = form
const { formState, control, handleSubmit } = form
const { fields, remove, append } = useFieldArray({
control,
name: 'enrollments'

View File

@@ -7,7 +7,7 @@ import {
Trash2Icon,
XIcon
} from 'lucide-react'
import { Fragment, useEffect } from 'react'
import { Fragment, use, useEffect } from 'react'
import { Controller, useFieldArray, useForm, useWatch } from 'react-hook-form'
import { z } from 'zod'
@@ -64,7 +64,8 @@ type BulkProps = {
courses: Promise<{ hits: Course[] }>
}
export function Bulk({ courses }: BulkProps) {
export function Bulk({ courses: courses_ }: BulkProps) {
const { hits: courses } = use(courses_)
const wizard = useWizard()
const { update, ...state } = useWizardStore()
const form = useForm({

View File

@@ -44,7 +44,6 @@ import { HttpMethod, request as req } from '@repo/util/request'
import { Step, StepItem, StepSeparator } from '@/components/step'
import { Wizard, WizardStep } from '@/components/wizard'
import { useWorksapce } from '@/components/workspace-switcher'
import { INTERNAL_EMAIL_DOMAIN } from '@/conf'
import { workspaceContext } from '@/middleware/workspace'
import { Button } from '@repo/ui/components/ui/button'
import { Spinner } from '@repo/ui/components/ui/spinner'

View File

@@ -9,8 +9,8 @@ import {
Trash2Icon
} from 'lucide-react'
import { Fragment, useMemo } from 'react'
import { Controller, useFieldArray, useForm } from 'react-hook-form'
import { Link, redirect, useParams } from 'react-router'
import { Controller, useFieldArray, useForm, useWatch } from 'react-hook-form'
import { Link, redirect, useFetcher, useParams } from 'react-router'
import {
Breadcrumb,
@@ -34,7 +34,9 @@ import {
HoverCardTrigger
} from '@repo/ui/components/ui/hover-card'
import { Kbd } from '@repo/ui/components/ui/kbd'
import { request as req } from '@repo/util/request'
import { Separator } from '@repo/ui/components/ui/separator'
import { Spinner } from '@repo/ui/components/ui/spinner'
import { HttpMethod, request as req } from '@repo/util/request'
import { workspaceContext } from '@/middleware/workspace'
import { CoursePicker } from '../_.$orgid.enrollments.add/course-picker'
@@ -42,6 +44,7 @@ import {
formSchema,
MAX_ITEMS,
type Course,
type Schema,
type User
} from '../_.$orgid.enrollments.add/data'
import {
@@ -57,9 +60,8 @@ export function meta({}: Route.MetaArgs) {
}
type Seat = {
id: string
pk: string
course: Course
order_id: string
enrollment_id: string
}
export async function loader({ request, params, context }: Route.LoaderArgs) {
@@ -75,13 +77,31 @@ export async function loader({ request, params, context }: Route.LoaderArgs) {
context
})
.then((r) => r.json() as any)
.then(({ items }) => items as Seat[])
.then(({ items }) => items as { sk: string; course: Course }[])
return { seats }
}
export async function action({ params, request, context }: Route.ActionArgs) {
const { orgid: org_id } = params
const body = (await request.json()) as object
const r = await req({
url: `enrollments`,
headers: new Headers({ 'Content-Type': 'application/json' }),
method: HttpMethod.POST,
body: JSON.stringify({ org_id, ...body }),
request,
context
})
const data = (await r.json()) as { sk: string }
return redirect(`/${org_id}/enrollments/${data.sk}/submitted`)
}
export default function Route({ loaderData: { seats } }: Route.ComponentProps) {
const { orgid } = useParams()
const fetcher = useFetcher()
const form = useForm({
resolver: zodResolver(formSchema),
defaultValues: { enrollments: [emptyRow] }
@@ -92,34 +112,80 @@ export default function Route({ loaderData: { seats } }: Route.ComponentProps) {
name: 'enrollments'
})
const courses = useMemo(
() =>
Promise.resolve({
hits: Array.from(
seats
.reduce((map, { course }) => {
const existing = map.get(course.id)
const enrollments = useWatch({
control,
name: 'enrollments'
})
if (existing) {
existing.quantity += 1
} else {
map.set(course.id, {
...course,
metadata__unit_price: 1,
quantity: 1
})
}
const usedSeatIds = useMemo(() => {
return new Set(enrollments?.map((e) => e.id).filter(Boolean))
}, [enrollments])
return map
}, new Map())
.values()
)
}),
[seats]
)
const seatsByCourse = useMemo(() => {
return seats.reduce<Record<string, Seat[]>>((acc, seat) => {
const courseId = seat.course.id
const [, order_id, , enrollment_id] = seat.sk.split('#')
console.log(seats)
if (!acc[courseId]) {
acc[courseId] = []
}
acc[courseId].push({ order_id, enrollment_id })
return acc
}, {})
}, [seats])
const usedSeatsByCourse = useMemo(() => {
const acc = new Map<string, number>()
seats.forEach((seat) => {
const [, , , enrollment_id] = seat.sk.split('#')
if (!usedSeatIds.has(enrollment_id)) {
return
}
const courseId = seat.course.id
acc.set(courseId, (acc.get(courseId) ?? 0) + 1)
})
return acc
}, [seats, usedSeatIds])
const courses = useMemo(() => {
return {
hits: Array.from(
seats
.reduce((acc, { course }) => {
const existing = acc.get(course.id)
if (existing) {
existing.quantity += 1
} else {
acc.set(course.id, {
...course,
metadata__unit_price: 1,
quantity: 1,
disabled: false
})
}
return acc
}, new Map<string, any>())
.values()
).map((course) => {
const used = usedSeatsByCourse.get(course.id) ?? 0
return { ...course, disabled: used >= course.quantity }
})
}
}, [seats, usedSeatsByCourse])
const onSubmit = async (data: Schema) => {
await fetcher.submit(JSON.stringify(data), {
method: 'post',
encType: 'application/json'
})
}
const onSearch = async (search: string) => {
const params = new URLSearchParams({ q: search })
const r = await fetch(`/${orgid}/users.json?${params.toString()}`)
@@ -127,15 +193,57 @@ export default function Route({ loaderData: { seats } }: Route.ComponentProps) {
return hits
}
const pickSeat = (courseId: string): Seat | null => {
const pool = seatsByCourse[courseId]
if (!pool) {
return null
}
return (
pool.find((seat) => {
return !usedSeatIds.has(seat.enrollment_id)
}) ?? null
)
}
const duplicateRow = (index: number, times: number = 1) => {
if (fields.length + times > MAX_ITEMS) {
return null
}
const { user, ...rest } = getValues(`enrollments.${index}`)
const { course } = getValues(`enrollments.${index}`)
if (!course?.id) {
Array.from({ length: times }, (_, i) => {
// @ts-ignore
insert(index + 1 + i, { course: null })
})
return
}
const reservedSeatIds = new Set(usedSeatIds)
Array.from({ length: times }, (_, i) => {
// @ts-ignore
insert(index + 1 + i, rest)
const pool = seatsByCourse[course.id]
const seat =
pool?.find((seat) => !reservedSeatIds.has(seat.enrollment_id)) ?? null
if (seat) {
reservedSeatIds.add(seat.enrollment_id)
// @ts-ignore
insert(index + 1 + i, {
id: seat.enrollment_id,
seat: { order_id: seat.order_id },
course
})
} else {
// @ts-ignore
insert(index + 1 + i, { course: null })
}
})
}
@@ -154,168 +262,206 @@ export default function Route({ loaderData: { seats } }: Route.ComponentProps) {
</BreadcrumbItem>
</BreadcrumbList>
</Breadcrumb>
<form
onSubmit={handleSubmit(onSubmit)}
className="lg:max-w-4xl mx-auto space-y-2.5"
autoComplete="off"
data-1p-ignore="true"
data-lpignore="true"
>
<Card className="lg:max-w-4xl mx-auto">
<CardHeader>
<CardTitle className="text-2xl">Adicionar matrículas</CardTitle>
<CardDescription>
Siga os passos abaixo para adicionar colaboradores às matrículas
abertas.
</CardDescription>
</CardHeader>
<Card className="lg:max-w-4xl mx-auto">
<CardHeader>
<CardTitle className="text-2xl">Adicionar matrículas</CardTitle>
<CardDescription>
Siga os passos abaixo para adicionar colaboradores às matrículas
abertas.
</CardDescription>
</CardHeader>
<CardContent className="space-y-4">
<div className="grid lg:grid-cols-[repeat(3,1fr)_auto] w-full gap-3">
{/* Header */}
<>
<Cell>Colaborador</Cell>
<Cell>Curso</Cell>
<Cell className="flex items-center gap-1.5">
Matricular em
<HoverCard openDelay={0}>
<HoverCardTrigger asChild>
<button type="button">
<CircleQuestionMarkIcon className="size-4 text-muted-foreground" />
</button>
</HoverCardTrigger>
<HoverCardContent
align="end"
className="text-sm space-y-1.5 lg:w-76"
>
<p>
Escolha a data em que o colaborador será matriculado no
curso.
</p>
<p>
Você poderá acompanhar as matrículas em{' '}
<Kbd>Agendamentos</Kbd>
</p>
</HoverCardContent>
</HoverCard>
</Cell>
<Cell>{/**/}</Cell>
</>
{/* Rows */}
<>
{fields.map((field, index) => (
<Fragment key={field.id}>
{/* Separator only for mobile */}
{index >= 1 && <div className="h-2.5 lg:hidden"></div>}
<Controller
control={control}
name={`enrollments.${index}.user`}
render={({
field: { name, value, onChange },
fieldState
}) => (
<div className="grid gap-1">
<UserPicker
value={value}
onChange={onChange}
onSearch={onSearch}
fieldState={fieldState}
/>
<ErrorMessage
errors={formState.errors}
name={name}
render={({ message }) => (
<p className="text-destructive text-sm">
{message}
</p>
)}
/>
</div>
)}
/>
<Controller
control={control}
name={`enrollments.${index}.course`}
render={({
field: { name, value, onChange },
fieldState
}) => (
<div className="grid gap-1">
<CoursePicker
value={value}
onChange={onChange}
options={courses}
error={fieldState.error}
readOnly
/>
<ErrorMessage
errors={formState.errors}
name={name}
render={({ message }) => (
<p className="text-destructive text-sm">
{message}
</p>
)}
/>
</div>
)}
/>
<Controller
control={control}
name={`enrollments.${index}.scheduled_for`}
render={({ field: { value, onChange } }) => (
<ScheduledForInput value={value} onChange={onChange} />
)}
/>
{/* Action */}
<div className="flex gap-1.5">
<Button
type="button"
tabIndex={-1}
variant="outline"
className="cursor-pointer"
onClick={() => duplicateRow(index)}
title="Duplicar linha"
<CardContent className="space-y-4">
<div className="grid lg:grid-cols-[repeat(3,1fr)_auto] w-full gap-3">
{/* Header */}
<>
<Cell>Colaborador</Cell>
<Cell>Curso</Cell>
<Cell className="flex items-center gap-1.5">
Matricular em
<HoverCard openDelay={0}>
<HoverCardTrigger asChild>
<button type="button">
<CircleQuestionMarkIcon className="size-4 text-muted-foreground" />
</button>
</HoverCardTrigger>
<HoverCardContent
align="end"
className="text-sm space-y-1.5 lg:w-76"
>
<CopyIcon />
</Button>
<p>
Escolha a data em que o colaborador será matriculado no
curso.
</p>
<DuplicateRowMultipleTimes
index={index}
duplicateRow={duplicateRow}
<p>
Você poderá acompanhar as matrículas em{' '}
<Kbd>Agendamentos</Kbd>
</p>
</HoverCardContent>
</HoverCard>
</Cell>
<Cell>{/**/}</Cell>
</>
{/* Rows */}
<>
{fields.map((field, index) => (
<Fragment key={field.id}>
{/* Separator only for mobile */}
{index >= 1 && <div className="h-2.5 lg:hidden"></div>}
<Controller
control={control}
name={`enrollments.${index}.user`}
render={({
field: { name, value, onChange },
fieldState
}) => (
<div className="grid gap-1">
<UserPicker
value={value}
onChange={onChange}
onSearch={onSearch}
fieldState={fieldState}
/>
<ErrorMessage
errors={formState.errors}
name={name}
render={({ message }) => (
<p className="text-destructive text-sm">
{message}
</p>
)}
/>
</div>
)}
/>
<Button
tabIndex={-1}
variant="destructive"
className="cursor-pointer"
disabled={fields.length == 1}
onClick={() => remove(index)}
>
<Trash2Icon />
</Button>
</div>
</Fragment>
))}
</>
</div>
<Controller
control={control}
name={`enrollments.${index}.course`}
render={({
field: { name, value, onChange },
fieldState
}) => (
<div className="grid gap-1">
<CoursePicker
value={value}
onChange={(course) => {
const seat = pickSeat(course.id)
<div className="max-lg:mt-2.5">
<Button
type="button"
// @ts-ignore
onClick={() => append(emptyRow)}
className="cursor-pointer"
disabled={fields.length == MAX_ITEMS}
variant="outline"
size="sm"
>
<PlusIcon /> Adicionar
</Button>
</div>
</CardContent>
</Card>
if (!seat) {
return
}
setValue(
`enrollments.${index}.id`,
seat.enrollment_id
)
setValue(
`enrollments.${index}.seat.order_id`,
seat.order_id
)
onChange(course)
}}
options={courses.hits}
error={fieldState.error}
readOnly
/>
<ErrorMessage
errors={formState.errors}
name={name}
render={({ message }) => (
<p className="text-destructive text-sm">
{message}
</p>
)}
/>
</div>
)}
/>
<Controller
control={control}
name={`enrollments.${index}.scheduled_for`}
render={({ field: { value, onChange } }) => (
<ScheduledForInput value={value} onChange={onChange} />
)}
/>
{/* Action */}
<div className="flex gap-1.5">
<Button
type="button"
tabIndex={-1}
variant="outline"
className="cursor-pointer"
onClick={() => duplicateRow(index)}
title="Duplicar linha"
>
<CopyIcon />
</Button>
<DuplicateRowMultipleTimes
index={index}
duplicateRow={duplicateRow}
/>
<Button
tabIndex={-1}
variant="destructive"
className="cursor-pointer"
disabled={fields.length == 1}
onClick={() => remove(index)}
>
<Trash2Icon />
</Button>
</div>
</Fragment>
))}
</>
</div>
<div className="max-lg:mt-2.5">
<Button
type="button"
// @ts-ignore
onClick={() => append(emptyRow)}
className="cursor-pointer"
disabled={fields.length == MAX_ITEMS}
variant="outline"
size="sm"
>
<PlusIcon /> Adicionar
</Button>
</div>
<Separator />
<div className="flex justify-end">
<Button
type="submit"
className="cursor-pointer"
disabled={formState.isSubmitting}
>
{formState.isSubmitting && <Spinner />}
Matricular
</Button>
</div>
</CardContent>
</Card>
</form>
</div>
)
}