Exercise selection per workshop

Solves #36

Author: rstropek

workshop-ui/src/app/api/exercises/route.ts

@@ -0,0 +1,31 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { getExercisesWithResponse } from '@/lib/exercise-file-manager';
+import { verifyAdmin } from '@/lib/session';
+
+/** 
+ * @route   GET /api/exercises
+ * @desc    Get all exercises (for admin use in workshop management)
+ * @response 200 { exercises: { [code: string]: { title: string } } } or 500 { error: string }
+ * @access  Admin only
+ */
+export async function GET(request: NextRequest) {
+  if (!(await verifyAdmin())) {
+    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
+  }
+
+  const exerciseResult = await getExercisesWithResponse();
+  if (!exerciseResult.success) {
+    return exerciseResult.error;
+  }
+
+  // Only return the code and title for each exercise (what the UI needs)
+  const exercises = Object.fromEntries(
+    Object.entries(exerciseResult.value.exercises).map(([code, exercise]) => [
+      code,
+      { title: exercise.title }
+    ])
+  );
+
+  return NextResponse.json({ exercises });
+}
+

workshop-ui/src/app/api/workshops/[id]/route.ts

@@ -50,7 +50,19 @@ export async function PUT(req: NextRequest, context: { params: Promise<{ id: str
   // Code sollte nicht überschrieben werden - entferne es aus den Update-Feldern
   const { code, ...fieldsToUpdate } = updateFields;
 
+  // Handle exerciseCodes explicitly: convert empty arrays to undefined (meaning "use defaults")
+  // This ensures that removing all exercises works correctly
+  if ('exerciseCodes' in fieldsToUpdate) {
+    if (Array.isArray(fieldsToUpdate.exerciseCodes) && fieldsToUpdate.exerciseCodes.length === 0) {
+      // Convert empty array to undefined and explicitly delete the property to ensure it's cleared
+      delete fieldsToUpdate.exerciseCodes;
+      delete workshops[index].exerciseCodes;
+    }
+  }
+  
+  // Apply updates
   workshops[index] = { ...workshops[index], ...fieldsToUpdate };
+  
   if (await writeWorkshops(workshops)) {
     return NextResponse.json(workshops[index]);
   } else {

workshop-ui/src/app/page.tsx

@@ -5,6 +5,7 @@ import { trace } from '@opentelemetry/api';
 
 import { getExercises } from '@/lib/exercise-file-manager';
 import { getAppSession, validateAppSession } from '@/lib/session';
+import { readWorkshops } from '@/lib/workshopService';
 import LogoutButton from '@/components/LogoutButton';
 
 import styles from './page.module.css';
@@ -16,7 +17,8 @@ type Difficulty = {
 
 export default async function Home() {
   // redirect to login if not authenticated
-  const isAuthenticated = await validateAppSession(await getAppSession());
+  const session = await getAppSession();
+  const isAuthenticated = await validateAppSession(session);
   if (!isAuthenticated) {
     const headersList = await headers();
     const pathname = headersList.get('x-pathname') || '/';
@@ -29,7 +31,26 @@ export default async function Home() {
     span?.addEvent('exercises_file_validation_error', { error: exercisesResult.error.error });
     throw new Error('Failed to load exercises');
   }
-  const exercisesData = exercisesResult.value.exercises;
+  const allExercises = exercisesResult.value.exercises;
+
+  // Get the workshop for this user
+  const workshops = await readWorkshops();
+  const workshop = workshops.find(w => w.code === session.accessCode);
+
+  // Filter exercises based on workshop configuration
+  let filteredExercises: typeof allExercises;
+  if (workshop?.exerciseCodes && workshop.exerciseCodes.length > 0) {
+    // If workshop has specific exercise codes, only show those
+    filteredExercises = Object.fromEntries(
+      Object.entries(allExercises).filter(([code]) => workshop.exerciseCodes!.includes(code))
+    );
+  } else {
+    // If no exercise codes specified, show exercises with visibleByDefault=true (default)
+    // visibleByDefault defaults to true if not specified, so we show exercises where it's not explicitly false
+    filteredExercises = Object.fromEntries(
+      Object.entries(allExercises).filter(([_, exercise]) => exercise.visibleByDefault !== false)
+    );
+  }
 
   function parseDifficulty(difficulty: string): Difficulty {
     switch (difficulty) {
@@ -52,7 +73,7 @@ export default async function Home() {
       <div className={styles.container}>
         <h1 className={styles.title}>AI Workshopübungen</h1>
         <div className={styles.exerciseGrid}>
-          {Object.entries(exercisesData).map(([key, exercise]) => (
+          {Object.entries(filteredExercises).map(([key, exercise]) => (
             <div key={key} className={styles.exerciseCard}>
               <Link href={exercise.url ?? `/chat/${key}`} className={styles.exerciseLink}>
                 <span className={`${styles.exerciseDifficulty} ${parseDifficulty(exercise.difficulty).class}`}>{parseDifficulty(exercise.difficulty).label}</span>

workshop-ui/src/app/workshops/page.module.css

@@ -102,112 +102,17 @@
     }
 }
 
-.newWorkshopButton,
-.submitButton,
-.saveButton,
-.cancelButton,
-.deleteButton {
+.newWorkshopButton {
     font-family: 'Poppins', sans-serif;
     padding: 0.5rem 1rem;
     border-radius: 6px;
     border: none;
     cursor: pointer;
-}
-
-.newWorkshopButton {
     background-color: #2563eb;
     color: white;
     white-space: nowrap;
 }
 
-.submitButton {
-    background-color: #2563eb;
-    color: white;
-}
-
-.saveButton {
-    background-color: #16a34a;
-    color: white;
-}
-
-.cancelButton {
-    background-color: #8f98a1;
-    color: white;
-}
-
-.deleteButton {
-    background-color: #dc2626; /* red for delete */
-    color: white;
-    transition: background-color 0.2s ease;
-}
-
-.deleteButton:hover {
-    background-color: #b91c1c; /* darker red on hover */
-}
-
-.formWrapper {
-    background-color: white;
-    padding: 1rem;
-    border-radius: 8px;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-    margin-bottom: 1rem;
-}
-
-.input,
-.textarea {
-    border: 1px solid #d1d5db;
-    padding: 0.5rem;
-    width: 100%;
-    margin-bottom: 0.5rem;
-    border-radius: 4px;
-    font-size: 1rem;
-    font-family: 'Poppins', sans-serif;
-}
-
-.textarea {
-    height: 4rem;
-    resize: vertical;
-}
-
-.timeRow {
-    display: flex;
-    gap: 0.5rem;
-    margin-bottom: 0.5rem;
-}
-
-.dateTimeRow {
-    display: flex;
-    gap: 0.5rem;
-    margin-bottom: 0.5rem;
-    align-items: center;
-}
-
-.timeInputGroup {
-    display: flex;
-    align-items: center;
-    gap: 0.5rem;
-    flex: 1;
-}
-
-.timeLabel {
-    font-size: 0.875rem;
-    color: #374151;
-    font-family: 'Poppins', sans-serif;
-    font-weight: 500;
-    white-space: nowrap;
-}
-
-.editButtonsRow {
-    display: flex;
-    gap: 0.5rem;
-    margin-top: 0.5rem;
-}
-
-.submitButton:disabled {
-    opacity: 0.5;
-    cursor: not-allowed;
-}
-
 /* Workshop table styles */
 .workshopTableWrapper {
     overflow-x: auto;