Merge remote-tracking branch 'origin/issue/45-integrar-el-wizard-de-creacin-de-materia' into issue/42-que-tenga-persistencia-el-plan-de-estudios

src/components/asignaturas/wizard/WizardControls.tsx

@@ -23,43 +23,41 @@ export function WizardControls({
   const isLast = idx >= Wizard.steps.length - 1
 
   return (
-    <div className="flex-none border-t bg-white p-6">
-      <div className="flex items-center justify-between">
-        <div className="flex-1">
-          {wizard.errorMessage && (
-            <span className="text-destructive text-sm font-medium">
-              {wizard.errorMessage}
-            </span>
-          )}
-        </div>
+    <div className="flex items-center justify-between">
+      <div className="flex-1">
+        {wizard.errorMessage && (
+          <span className="text-destructive text-sm font-medium">
+            {wizard.errorMessage}
+          </span>
+        )}
+      </div>
 
-        <div className="flex gap-4">
+      <div className="flex gap-4">
+        <Button
+          variant="secondary"
+          onClick={() => methods.prev()}
+          disabled={idx === 0 || wizard.isLoading}
+        >
+          Anterior
+        </Button>
+
+        {!isLast ? (
           <Button
-            variant="secondary"
-            onClick={() => methods.prev()}
-            disabled={idx === 0 || wizard.isLoading}
+            onClick={() => methods.next()}
+            disabled={
+              wizard.isLoading ||
+              (idx === 0 && !canContinueDesdeMetodo) ||
+              (idx === 1 && !canContinueDesdeBasicos) ||
+              (idx === 2 && !canContinueDesdeConfig)
+            }
           >
-            Anterior
+            Siguiente
           </Button>
-
-          {!isLast ? (
-            <Button
-              onClick={() => methods.next()}
-              disabled={
-                wizard.isLoading ||
-                (idx === 0 && !canContinueDesdeMetodo) ||
-                (idx === 1 && !canContinueDesdeBasicos) ||
-                (idx === 2 && !canContinueDesdeConfig)
-              }
-            >
-              Siguiente
-            </Button>
-          ) : (
-            <Button onClick={onCreate} disabled={wizard.isLoading}>
-              {wizard.isLoading ? 'Creando...' : 'Crear Asignatura'}
-            </Button>
-          )}
-        </div>
+        ) : (
+          <Button onClick={onCreate} disabled={wizard.isLoading}>
+            {wizard.isLoading ? 'Creando...' : 'Crear Asignatura'}
+          </Button>
+        )}
       </div>
     </div>
   )

src/components/planes/wizard/PasoBasicosForm/PasoBasicosForm.tsx

@@ -34,7 +34,7 @@ export function PasoBasicosForm({
   const estructurasPlanList = catalogos?.estructurasPlan ?? []
 
   const filteredCarreras = rawCarreras.filter((c: any) => {
-    const facId = wizard.datosBasicos.facultadId
+    const facId = wizard.datosBasicos.facultad.id
     if (!facId) return true
     // soportar ambos shapes: `facultad_id` (BD) o `facultadId` (local)
     return c.facultad_id ? c.facultad_id === facId : c.facultadId === facId
@@ -68,15 +68,20 @@ export function PasoBasicosForm({
         <div className="grid gap-1">
           <Label htmlFor="facultad">Facultad</Label>
           <Select
-            value={wizard.datosBasicos.facultadId}
+            value={wizard.datosBasicos.facultad.id}
             onValueChange={(value) =>
               onChange(
                 (w): NewPlanWizardState => ({
                   ...w,
                   datosBasicos: {
                     ...w.datosBasicos,
-                    facultadId: value,
-                    carreraId: '',
+                    facultad: {
+                      id: value,
+                      nombre:
+                        facultadesList.find((f) => f.id === value)?.nombre ||
+                        '',
+                    },
+                    carrera: { id: '', nombre: '' },
                   },
                 }),
               )
@@ -86,7 +91,7 @@ export function PasoBasicosForm({
               id="facultad"
               className={cn(
                 'w-full min-w-0 [&>span]:block! [&>span]:truncate!',
-                !wizard.datosBasicos.facultadId
+                !wizard.datosBasicos.facultad.id
                   ? 'text-muted-foreground font-normal italic opacity-70' // Es Placeholder
                   : 'font-medium not-italic', // Tiene Valor (Medium)
               )}
@@ -106,22 +111,30 @@ export function PasoBasicosForm({
         <div className="grid gap-1">
           <Label htmlFor="carrera">Carrera</Label>
           <Select
-            value={wizard.datosBasicos.carreraId}
+            value={wizard.datosBasicos.carrera.id}
             onValueChange={(value) =>
               onChange(
                 (w): NewPlanWizardState => ({
                   ...w,
-                  datosBasicos: { ...w.datosBasicos, carreraId: value },
+                  datosBasicos: {
+                    ...w.datosBasicos,
+                    carrera: {
+                      id: value,
+                      nombre:
+                        filteredCarreras.find((c) => c.id === value)?.nombre ||
+                        '',
+                    },
+                  },
                 }),
               )
             }
-            disabled={!wizard.datosBasicos.facultadId}
+            disabled={!wizard.datosBasicos.facultad.id}
           >
             <SelectTrigger
               id="carrera"
               className={cn(
                 'w-full min-w-0 [&>span]:block! [&>span]:truncate!',
-                !wizard.datosBasicos.carreraId
+                !wizard.datosBasicos.carrera.id
                   ? 'text-muted-foreground font-normal italic opacity-70' // Es Placeholder
                   : 'font-medium not-italic', // Tiene Valor (Medium)
               )}

src/components/planes/wizard/PasoDetallesPanel/PasoDetallesPanel.tsx

@@ -79,7 +79,7 @@ export function PasoDetallesPanel({
                 ...w,
                 iaConfig: {
                   ...(w.iaConfig || ({} as any)),
-                  InstruccionesAdicionalesIA: e.target.value,
+                  instruccionesAdicionalesIA: e.target.value,
                 },
               }))
             }

src/components/planes/wizard/PasoDetallesPanel/ReferenciasParaIA.tsx

@@ -17,6 +17,7 @@ import {
   TabsContents,
 } from '@/components/ui/motion-tabs'
 import { ARCHIVOS, REPOSITORIOS } from '@/features/planes/nuevo/catalogs'
+import { cn } from '@/lib/utils'
 
 const ReferenciasParaIA = ({
   selectedArchivoIds = [],
@@ -87,7 +88,10 @@ const ReferenciasParaIA = ({
                   onCheckedChange={(checked) =>
                     onToggleArchivo?.(archivo.id, !!checked)
                   }
-                  className="peer border-primary ring-offset-background data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground focus-visible:ring-ring h-5 w-5 shrink-0 rounded-sm border focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50"
+                  className={cn(
+                    'peer border-primary ring-offset-background data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground focus-visible:ring-ring h-5 w-5 shrink-0 rounded-sm border focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50',
+                    selectedArchivoIds.includes(archivo.id) ? '' : 'invisible',
+                  )}
                 />
 
                 <FileText className="text-muted-foreground h-4 w-4" />
@@ -134,7 +138,12 @@ const ReferenciasParaIA = ({
                   onCheckedChange={(checked) =>
                     onToggleRepositorio?.(repositorio.id, !!checked)
                   }
-                  className="peer border-primary ring-offset-background data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground focus-visible:ring-ring h-5 w-5 shrink-0 rounded-sm border focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50"
+                  className={cn(
+                    'peer border-primary ring-offset-background data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground focus-visible:ring-ring h-5 w-5 shrink-0 rounded-sm border focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50',
+                    selectedRepositorioIds.includes(repositorio.id)
+                      ? ''
+                      : 'invisible',
+                  )}
                 />
 
                 <FolderOpen className="text-muted-foreground h-4 w-4" />

src/components/planes/wizard/PasoResumenCard.tsx

@@ -45,8 +45,8 @@ export function PasoResumenCard({ wizard }: { wizard: NewPlanWizardState }) {
                     Facultad/Carrera:{' '}
                   </span>
                   <span className="font-medium">
-                    {wizard.datosBasicos.facultadId || '—'} /{' '}
-                    {wizard.datosBasicos.carreraId || '—'}
+                    {wizard.datosBasicos.facultad.nombre || '—'} /{' '}
+                    {wizard.datosBasicos.carrera.nombre || '—'}
                   </span>
                 </div>
                 <div>

src/components/planes/wizard/WizardControls.tsx

@@ -57,8 +57,8 @@ export function WizardControls({
         const aiInput = {
           datosBasicos: {
             nombrePlan: wizard.datosBasicos.nombrePlan,
-            carreraId: wizard.datosBasicos.carreraId,
-            facultadId: wizard.datosBasicos.facultadId || undefined,
+            carreraId: wizard.datosBasicos.carrera.id || undefined,
+            facultadId: wizard.datosBasicos.facultad.id || undefined,
             nivel: wizard.datosBasicos.nivel as string,
             tipoCiclo: tipoCicloSafe,
             numCiclos: numCiclosSafe,
@@ -81,7 +81,7 @@ export function WizardControls({
         console.log(`${new Date().toISOString()} - Plan IA generado`, data)
 
         navigate({
-          to: `/planes/${data.plan.id}/datos`,
+          to: `/planes/${data.plan.id}`,
           state: { showConfetti: true },
         })
         return
@@ -90,7 +90,7 @@ export function WizardControls({
       if (wizard.tipoOrigen === 'MANUAL') {
         // Crear plan vacío manualmente usando el hook
         const plan = await createPlanManual.mutateAsync({
-          carreraId: wizard.datosBasicos.carreraId,
+          carreraId: wizard.datosBasicos.carrera.id,
           estructuraId: wizard.datosBasicos.estructuraPlanId as string,
           nombre: wizard.datosBasicos.nombrePlan,
           nivel: wizard.datosBasicos.nivel as NivelPlanEstudio,
@@ -101,7 +101,7 @@ export function WizardControls({
 
         // Navegar al nuevo plan
         navigate({
-          to: `/planes/${plan.id}/datos`,
+          to: `/planes/${plan.id}`,
           state: { showConfetti: true },
         })
         return

src/components/wizard/StepWithTooltip.tsx

@@ -0,0 +1,41 @@
+import { useState } from 'react'
+
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from '@/components/ui/tooltip'
+
+export function StepWithTooltip({
+  title,
+  desc,
+}: {
+  title: string
+  desc: string
+}) {
+  const [isOpen, setIsOpen] = useState(false)
+
+  return (
+    <TooltipProvider delayDuration={0}>
+      <Tooltip open={isOpen} onOpenChange={setIsOpen}>
+        <TooltipTrigger asChild>
+          <span
+            className="cursor-help decoration-dotted underline-offset-4 hover:underline"
+            onClick={(e) => {
+              e.stopPropagation()
+              setIsOpen((prev) => !prev)
+            }}
+            onMouseEnter={() => setIsOpen(true)}
+            onMouseLeave={() => setIsOpen(false)}
+          >
+            {title}
+          </span>
+        </TooltipTrigger>
+        <TooltipContent className="max-w-50 text-xs">
+          <p>{desc}</p>
+        </TooltipContent>
+      </Tooltip>
+    </TooltipProvider>
+  )
+}

src/components/wizard/WizardLayout.tsx

@@ -0,0 +1,52 @@
+import * as Icons from 'lucide-react'
+
+import { CardHeader, CardTitle } from '@/components/ui/card'
+import { Dialog, DialogContent } from '@/components/ui/dialog'
+
+export function WizardLayout({
+  title,
+  onClose,
+  headerSlot,
+  footerSlot,
+  children,
+}: {
+  title: string
+  onClose: () => void
+  headerSlot?: React.ReactNode
+  footerSlot?: React.ReactNode
+  children: React.ReactNode
+}) {
+  return (
+    <Dialog open={true} onOpenChange={(open) => !open && onClose()}>
+      <DialogContent
+        className="flex h-[90vh] w-[calc(100%-2rem)] flex-col gap-0 overflow-hidden p-0 sm:max-w-4xl"
+        onInteractOutside={(e) => {
+          e.preventDefault()
+        }}
+      >
+        <div className="z-10 flex-none border-b bg-white">
+          <CardHeader className="flex flex-row items-center justify-between gap-4 p-6 pb-4">
+            <CardTitle>{title}</CardTitle>
+            <button
+              onClick={onClose}
+              className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-none disabled:pointer-events-none"
+            >
+              <Icons.X className="h-4 w-4" />
+              <span className="sr-only">Cerrar</span>
+            </button>
+          </CardHeader>
+
+          {headerSlot ? <div className="px-6 pb-6">{headerSlot}</div> : null}
+        </div>
+
+        <div className="flex-1 overflow-y-auto bg-gray-50/30 p-6">
+          {children}
+        </div>
+
+        {footerSlot ? (
+          <div className="flex-none border-t bg-white p-6">{footerSlot}</div>
+        ) : null}
+      </DialogContent>
+    </Dialog>
+  )
+}

src/components/wizard/WizardResponsiveHeader.tsx

@@ -0,0 +1,59 @@
+import { CircularProgress } from '@/components/CircularProgress'
+import { StepWithTooltip } from '@/components/wizard/StepWithTooltip'
+
+export function WizardResponsiveHeader({
+  wizard,
+  methods,
+}: {
+  wizard: any
+  methods: any
+}) {
+  const idx = wizard.utils.getIndex(methods.current.id)
+  const totalSteps = wizard.steps.length
+  const currentIndex = idx + 1
+  const hasNextStep = idx < totalSteps - 1
+  const nextStep = wizard.steps[currentIndex]
+
+  return (
+    <>
+      <div className="block sm:hidden">
+        <div className="flex items-center gap-5">
+          <CircularProgress current={currentIndex} total={totalSteps} />
+          <div className="flex flex-col justify-center">
+            <h2 className="text-lg font-bold text-slate-900">
+              <StepWithTooltip
+                title={methods.current.title}
+                desc={methods.current.description}
+              />
+            </h2>
+            {hasNextStep && nextStep ? (
+              <p className="text-sm text-slate-400">
+                Siguiente: {nextStep.title}
+              </p>
+            ) : (
+              <p className="text-sm font-medium text-green-500">
+                ¡Último paso!
+              </p>
+            )}
+          </div>
+        </div>
+      </div>
+
+      <div className="hidden sm:block">
+        <wizard.Stepper.Navigation className="border-border/60 rounded-xl border bg-slate-50 p-2">
+          {wizard.steps.map((step: any) => (
+            <wizard.Stepper.Step
+              key={step.id}
+              of={step.id}
+              className="whitespace-nowrap"
+            >
+              <wizard.Stepper.Title>
+                <StepWithTooltip title={step.title} desc={step.description} />
+              </wizard.Stepper.Title>
+            </wizard.Stepper.Step>
+          ))}
+        </wizard.Stepper.Navigation>
+      </div>
+    </>
+  )
+}