Deployment

apps/web/package.json

@@ -61,7 +61,7 @@
     "is-hotkey": "^0.2.0",
     "js-cookie": "^3.0.5",
     "json-diff": "^1.0.6",
-    "katex": "^0.16.9",
+    "katex": "^0.16.10",
     "mathjs": "^12.3.1",
     "mathlive": "^0.98.4",
     "next": "^13.5.4",
@@ -137,17 +137,17 @@
     "@types/react-syntax-highlighter": "^15.5.8",
     "@types/slate-react": "^0.50.1",
     "@types/uuid": "^9.0.5",
-    "@typescript-eslint/eslint-plugin": "^6.7.5",
-    "@typescript-eslint/parser": "^6.7.5",
+    "@typescript-eslint/eslint-plugin": "^7.4.0",
+    "@typescript-eslint/parser": "^7.4.0",
     "babel-jest": "^29.7.0",
     "cross-env": "^7.0.3",
     "dotenv": "^16.3.1",
-    "eslint": "^8.51.0",
+    "eslint": "^8.57.0",
     "eslint-config-next": "^13.5.4",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "graphql-tag": "2.12.6",
     "jest": "^27.5.1",
@@ -156,17 +156,17 @@
     "npm-run-all": "^4.1.5",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-nested": "^6.0.1",
-    "prettier": "^3.0.3",
-    "prettier-plugin-packagejson": "^2.4.6",
-    "prettier-plugin-tailwindcss": "^0.5.7",
+    "prettier": "^3.2.5",
+    "prettier-plugin-packagejson": "^2.4.13",
+    "prettier-plugin-tailwindcss": "^0.5.13",
     "prisma": "^5.2.0",
     "prop-types": "^15.8.1",
     "react-is": "^18.2.0",
     "styled-jsx-plugin-postcss": "^4.0.1",
     "tailwindcss": "^3.4.1",
     "tailwindcss-animate": "^1.0.7",
     "ts-unused-exports": "^10.0.1",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.3"
   },
   "packageManager": "[email protected]",
   "engines": {

apps/web/src/components/comments/comment-area-all-threads-thread.tsx

@@ -1,4 +1,4 @@
-import { Entity, Thread } from '@serlo/authorization'
+import { Thread } from '@serlo/authorization'
 import Link from 'next/link'
 import { useState } from 'react'
 
@@ -43,7 +43,6 @@ export function CommentAreaAllThreadsThread({
   const canSetStatus =
     auth &&
     (canDo(Thread.setThreadState) ||
-      canDo(Entity.checkoutRevision) ||
       thread.comments.nodes.some((obj) => obj.author.id === auth.id))
 
   return (
@@ -64,12 +63,13 @@ export function CommentAreaAllThreadsThread({
           <div>
             <select
               className={cn(
-                'mb-1 rounded py-2 pl-4 pr-6 disabled:appearance-none disabled:py-1 disabled:text-center',
+                'mb-1 rounded bg-opacity-40 py-2 pl-4 pr-6 opacity-100',
+                'disabled:cursor-not-allowed disabled:appearance-none disabled:px-4 disabled:py-1 disabled:text-center',
                 status === 'open'
                   ? 'bg-yellow'
                   : status === CommentStatus.Done
                     ? 'bg-brandgreen-500'
-                    : 'bg-gray-200'
+                    : 'bg-gray-300'
               )}
               disabled={!canSetStatus}
               value={status}

apps/web/src/components/exams-info-box.tsx

@@ -1,14 +1,20 @@
 import { BoxRenderer } from '@editor/plugins/box/renderer'
 import { faDiscord } from '@fortawesome/free-brands-svg-icons'
 import { faGraduationCap } from '@fortawesome/free-solid-svg-icons'
+import Head from 'next/head'
 
 import { Link } from './content/link'
 import { FaIcon } from './fa-icon'
-import { mathExamTaxBY } from '@/data/de/math-exams-taxonomies'
+import { extraMetaTags, mathExamTaxBY } from '@/data/de/math-exams-taxonomies'
 import { cn } from '@/helper/cn'
 
 export function ExamsInfoBox({ examsFolderId }: { examsFolderId: number }) {
   const isInBYTax = mathExamTaxBY.includes(examsFolderId)
+
+  const extraMeta = Object.hasOwn(extraMetaTags, examsFolderId)
+    ? extraMetaTags[examsFolderId as keyof typeof extraMetaTags]
+    : undefined
+
   return (
     <>
       <div
@@ -94,6 +100,13 @@ export function ExamsInfoBox({ examsFolderId }: { examsFolderId: number }) {
             ) : null}
           </>
         </BoxRenderer>
+        {extraMeta ? (
+          <Head>
+            <title>{extraMeta.title}</title>
+            <meta name="description" content={extraMeta.metaDescription} />
+          </Head>
+        ) : null}
+
         <style jsx global>
           {`
             #secondary-menu {

apps/web/src/components/revisions/unrevised-entity.tsx

@@ -45,9 +45,6 @@ function getTitle(entity: UnrevisedRevisionEntity) {
 export function UnrevisedEntity({ entity, isOwn }: UnrevisedEntityProps) {
   const { strings } = useInstanceData()
 
-  // TODO: remove after migration, api changes and codegen
-  if (entity.__typename === 'GroupedExercise') return null
-
   const nodes = getNodes(entity)
   const title = getTitle(entity)
   const isProbablyNew = entity.currentRevision === null

apps/web/src/components/user/profile-experimental.tsx

@@ -5,6 +5,12 @@ import { cn } from '@/helper/cn'
 import { isProduction } from '@/helper/is-production'
 
 export const features = {
+  editorIntermediateTasks: {
+    cookieName: 'useEditorIntermediateTasks',
+    isActive: false,
+    activeInDev: true,
+    hideInProduction: false,
+  },
   edtrPasteHack: {
     cookieName: 'useEdtrPasteHack',
     isActive: false,
@@ -88,6 +94,17 @@ export function ProfileExperimental() {
       <h2 className="serlo-h2" id="experiments">
         🧪 Experimente
       </h2>
+      {shouldBeVisible('editorIntermediateTasks') ? (
+        <div>
+          <h3 className="serlo-h3 mb-3">
+            {renderFeatureButton('editorIntermediateTasks')} Zwischentexte für
+            Aufgaben mit Teilaufgaben 🛠
+          </h3>
+          <p className="serlo-p">
+            Experimentelles Feature: nur für Teammitglieder im Prüfungsbereich.
+          </p>
+        </div>
+      ) : null}
       {shouldBeVisible('edtrPasteHack') ? (
         <div>
           <h3 className="serlo-h3 mb-3">
@@ -136,7 +153,7 @@ export function ProfileExperimental() {
   function renderFeatureButton(feature: FeatureKey, href?: string) {
     if (!features[feature]) return null
 
-    const isActive = features[feature]!.isActive
+    const isActive = features[feature].isActive
     return (
       <button
         className="inline-block cursor-pointer align-bottom"

apps/web/src/data/de/index.ts

@@ -153,7 +153,8 @@ export const instanceData = {
         chooseOption: "Klicke auf eine der Optionen.",
         printModeChooseOption: "Kreuze eine der Optionen an.",
         strategy: "Strategie",
-        solution: "Lösungsvorschlag"
+        solution: "Lösungsvorschlag",
+        showHiddenInteractive: "Hier deine Lösung prüfen"
       },
       boxTypes: {
         blank: "Blanko",
@@ -822,7 +823,12 @@ export const loggedInData = {
         exercise: {
           title: "Aufgabe",
           description: "Interaktive- oder Textaufgaben",
-          placeholder: "Füge hier den Arbeitsauftrag ein (Optional)"
+          placeholder: "Füge hier den Arbeitsauftrag ein (Optional)",
+          hideInteractiveInitially: {
+            info: "Interaktives Element ist versteckt beim laden",
+            deactivate: "Interaktives Element sichtbar laden",
+            activate: "Interaktives Element versteckt laden"
+          }
         },
         inputExercise: {
           title: "Eingabefeld",
@@ -968,7 +974,10 @@ export const loggedInData = {
           addExercise: "Teilaufgabe hinzufügen",
           kindOfExerciseGroup: "Art der Aufgabengruppe",
           notCohesive: "nicht zusammenhängend",
-          cohesive: "zusammenhängend"
+          cohesive: "zusammenhängend",
+          addIntermediateTask: "Zwischentext hinzufügen",
+          removeIntermediateTask: "Zwischentext entfernen",
+          intermediateTask: "Zwischentext"
         }
       },
       edtrIo: {

apps/web/src/data/de/math-exams-taxonomies.ts

@@ -9,3 +9,41 @@ export const mathExamsTaxonomies = [...mathExamTaxNI, ...mathExamTaxBY]
 export const schoolTaxonomies = [
   201593, 16259, 16157, 16042, 97943, 97944, 97945, 97946, 97947, 16376, 16033,
 ]
+
+export const extraMetaTags = {
+  297606: {
+    title: 'Abiturprüfungen Mathe eA mit Lösungen',
+    metaDescription:
+      'Mathe lernen fürs Abitur mit Serlo. Mathe Abi Aufgaben erhöhtes Anforderungsnvieau mit Lösungen. Du schaffst das!',
+  },
+  300778: {
+    title: 'Abiturprüfungen Mathe gA mit Lösungen',
+    metaDescription:
+      'Mathe lernen fürs Abitur mit Serlo. Mathe Abi Aufgaben grundlegendes Anforderungsnvieau mit Lösungen. Du schaffst das!',
+  },
+  297604: {
+    title: 'Mathe Prüfungsaufgaben mit Lösungen | Realschule',
+    metaDescription:
+      'Mathe lernen für die Realschul- Abschlussprüfungen mit Original- Aufgaben und Lösungshilfe. Mit Serlo schaffst du das!',
+  },
+  302433: {
+    title: 'IGS-Prüfungen Mathe G-Kurs mit Lösungen',
+    metaDescription:
+      'Mathe lernen mit Original Aufgaben und Lösungen für die Abschlussprüfungen an der Gesamtschule. Mit Serlo schaffst du das!',
+  },
+  20852: {
+    title: 'Mathe Abiturprüfungen mit Lösung',
+    metaDescription:
+      'Die beste Vorbereitung fürs Mathe Abi. Mathe-Aufgaben fürs Abitur mit Lösungen und Erklärungen. Mit Serlo schaffst du das!',
+  },
+  75049: {
+    title: 'Mathe Abschlussprüfungen mit Lösung | Mittlere Reife',
+    metaDescription:
+      'Deine Vorbereitung für die Mittlere Reife Zweig i: Mathe lernen mit Original Prüfungsaufgaben. Mit Serlo schaffst du das!',
+  },
+  76750: {
+    title: 'Mathe Abschlussprüfungen mit Lösung | Mittlere Reife',
+    metaDescription:
+      '	Deine Vorbereitung für die Mittlere Reife Zweig ii und iii: Mathe lernen mit Original Prüfungsaufgaben. Mit Serlo schaffst du das!',
+  },
+} as const

apps/web/src/data/en/index.ts

@@ -164,6 +164,7 @@ export const instanceData = {
         printModeChooseOption: 'Check one of the options.',
         strategy: 'Strategy',
         solution: 'Proposed Solution',
+        showHiddenInteractive: 'Check your solution here',
       },
       boxTypes: {
         blank: 'Blank',
@@ -902,6 +903,11 @@ export const loggedInData = {
           title: 'Exercise',
           description: 'Interactive or text based exercise',
           placeholder: 'Type the assignment here (Optional)',
+          hideInteractiveInitially: {
+            info: 'Interactive element collapsed on load',
+            deactivate: 'Load Interactive Element visible',
+            activate: 'Load Interactive Element collapsed',
+          },
         },
         inputExercise: {
           title: 'Input Exercise',
@@ -1052,6 +1058,9 @@ export const loggedInData = {
           kindOfExerciseGroup: 'Kind of exercise group',
           notCohesive: 'not cohesive',
           cohesive: 'cohesive',
+          addIntermediateTask: 'Add Intermediate Task',
+          removeIntermediateTask: 'Remove intermediate Task',
+          intermediateTask: 'Intermediate Task',
         },
       },
       edtrIo: {

apps/web/src/data/es/index.ts

@@ -153,7 +153,8 @@ export const instanceData = {
         chooseOption: "Elige una de las opciones.",
         printModeChooseOption: "Elige una de las opciones.",
         strategy: "Estrategia",
-        solution: "Solución propuesta"
+        solution: "Solución propuesta",
+        showHiddenInteractive: 'Check your solution here'
       },
       boxTypes: {
         blank: "Blanco",
@@ -822,7 +823,12 @@ export const loggedInData = {
         exercise: {
           title: "Ejercicio",
           description: "Ejercicio interactivo o basado en texto",
-          placeholder: 'Type the assignment here (Optional)'
+          placeholder: 'Type the assignment here (Optional)',
+          hideInteractiveInitially: {
+            info: 'Interactive element collapsed on load',
+            deactivate: 'Load Interactive Element visible',
+            activate: 'Load Interactive Element collapsed'
+          }
         },
         inputExercise: {
           title: "Ejercicio de respuesta escrita",
@@ -968,7 +974,10 @@ export const loggedInData = {
           addExercise: "Añadir ejercicio",
           kindOfExerciseGroup: "Tipo de grupo de ejercicios",
           notCohesive: "no es cohesivo",
-          cohesive: "cohesivo"
+          cohesive: "cohesivo",
+          addIntermediateTask: 'Add Intermediate Task',
+          removeIntermediateTask: 'Remove intermediate Task',
+          intermediateTask: 'Intermediate Task'
         }
       },
       edtrIo: {

apps/web/src/data/fr/index.ts

@@ -153,7 +153,8 @@ export const instanceData = {
         chooseOption: "Sélectionne une des options :",
         printModeChooseOption: "Sélectionne une des options :",
         strategy: 'Strategy',
-        solution: 'Proposed Solution'
+        solution: 'Proposed Solution',
+        showHiddenInteractive: 'Check your solution here'
       },
       boxTypes: {
         blank: 'Blank',
@@ -822,7 +823,12 @@ export const loggedInData = {
         exercise: {
           title: "Exercice",
           description: 'Interactive or text based exercise',
-          placeholder: 'Type the assignment here (Optional)'
+          placeholder: 'Type the assignment here (Optional)',
+          hideInteractiveInitially: {
+            info: 'Interactive element collapsed on load',
+            deactivate: 'Load Interactive Element visible',
+            activate: 'Load Interactive Element collapsed'
+          }
         },
         inputExercise: {
           title: 'Input Exercise',
@@ -968,7 +974,10 @@ export const loggedInData = {
           addExercise: "Ajouter un exercice",
           kindOfExerciseGroup: "Type de groupe d'exercice",
           notCohesive: "pas cohérent",
-          cohesive: "cohérent"
+          cohesive: "cohérent",
+          addIntermediateTask: 'Add Intermediate Task',
+          removeIntermediateTask: 'Remove intermediate Task',
+          intermediateTask: 'Intermediate Task'
         }
       },
       edtrIo: {

apps/web/src/data/hi/index.ts

@@ -153,7 +153,8 @@ export const instanceData = {
         chooseOption: "किसी एक विकल्प पर क्लिक करें",
         printModeChooseOption: "किसी एक विकल्प पर क्लिक करें",
         strategy: 'Strategy',
-        solution: 'Proposed Solution'
+        solution: 'Proposed Solution',
+        showHiddenInteractive: 'Check your solution here'
       },
       boxTypes: {
         blank: 'Blank',
@@ -822,7 +823,12 @@ export const loggedInData = {
         exercise: {
           title: "अभ्यास",
           description: 'Interactive or text based exercise',
-          placeholder: 'Type the assignment here (Optional)'
+          placeholder: 'Type the assignment here (Optional)',
+          hideInteractiveInitially: {
+            info: 'Interactive element collapsed on load',
+            deactivate: 'Load Interactive Element visible',
+            activate: 'Load Interactive Element collapsed'
+          }
         },
         inputExercise: {
           title: 'Input Exercise',
@@ -968,7 +974,10 @@ export const loggedInData = {
           addExercise: 'Add exercise',
           kindOfExerciseGroup: 'Kind of exercise group',
           notCohesive: 'not cohesive',
-          cohesive: 'cohesive'
+          cohesive: 'cohesive',
+          addIntermediateTask: 'Add Intermediate Task',
+          removeIntermediateTask: 'Remove intermediate Task',
+          intermediateTask: 'Intermediate Task'
         }
       },
       edtrIo: {