Merge pull request #3653 from serlo/api-cohesive

refactor: forget about cohesive

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

@@ -1056,8 +1056,6 @@ export const loggedInData = {
           removeExercise: 'Remove exercise',
           addExercise: 'Add exercise',
           kindOfExerciseGroup: 'Kind of exercise group',
-          notCohesive: 'not cohesive',
-          cohesive: 'cohesive',
           addIntermediateTask: 'Add Intermediate Task',
           removeIntermediateTask: 'Remove intermediate Task',
           intermediateTask: 'Intermediate Task',

apps/web/src/fetcher/query-fragments.ts

@@ -26,10 +26,6 @@ export const sharedRevisionFragments = gql`
   fragment coursePageRevision on CoursePageRevision {
     alias
   }
-
-  fragment exerciseGroupRevision on ExerciseGroupRevision {
-    cohesive
-  }
 `
 
 export const sharedEventFragments = gql`

apps/web/src/fetcher/query.ts

@@ -98,12 +98,6 @@ export const dataQuery = gql`
         ...exercise
       }
 
-      ... on ExerciseGroup {
-        currentRevision {
-          ...exerciseGroupRevision
-        }
-      }
-
       ... on Course {
         pages(trashed: false) {
           alias
@@ -150,7 +144,6 @@ export const dataQuery = gql`
                 content
                 id
                 date
-                cohesive
               }
               licenseId
             }

apps/web/src/fetcher/revision/query.ts

@@ -106,14 +106,6 @@ export const revisionQuery = gql`
           }
         }
       }
-      ... on ExerciseGroupRevision {
-        ...exerciseGroupRevision
-        repository {
-          currentRevision {
-            ...exerciseGroupRevision
-          }
-        }
-      }
       ... on VideoRevision {
         ...videoRevision
         repository {

apps/web/src/helper/ai-generated-exercises/data-conversion.ts

@@ -152,7 +152,6 @@ function createExerciseGroupDocument(
         state: [createExerciseHeadingTextDocument(heading)],
       },
       exercises,
-      cohesive: false,
       intermediateTasks: undefined,
     },
   }
@@ -365,7 +364,6 @@ export function transformEditorDataToExerciseGroup(
       licenseId: license.id,
       changes: '[KI generiert]: ',
       revision: 0,
-      cohesive: false,
       //@ts-expect-error ignoring this while exercise group migration is going on
       content: JSON.stringify(
         createExerciseGroupDocument(editorData.heading, editorData.exercises)

apps/web/src/mutations/use-set-entity-mutation/use-set-entity-mutation.ts

@@ -275,7 +275,7 @@ function getAdditionalInputData(
     case UuidType.Exercise:
       return {}
     case UuidType.ExerciseGroup:
-      return { cohesive: data.cohesive === 'true' }
+      return {}
     case UuidType.Video:
       return {
         title: getRequiredString(mutationStrings, 'title', data.title),

apps/web/src/serlo-editor-integration/convert-editor-response-to-state.ts

@@ -293,7 +293,6 @@ export function convertEditorResponseToState(
         changes: '',
         revision,
         content: serializeStaticDocument(parseStaticString(content)),
-        cohesive: uuid.currentRevision?.cohesive ?? false,
       },
     }
   }
@@ -425,7 +424,6 @@ interface InputType {
 
 export interface TextExerciseGroupSerializedState extends Entity {
   __typename?: UuidType.ExerciseGroup
-  cohesive?: string
   content: SerializedStaticState
 }
 

apps/web/src/serlo-editor-integration/revision-response-to-response.ts

@@ -145,7 +145,6 @@ export function revisionResponseToResponse(
         id,
         content,
         title,
-        cohesive: uuid.cohesive,
         date,
       },
       taxonomyTerms: uuid.repository.taxonomyTerms,

packages/editor/src/plugins/exercise-group/index.tsx

@@ -4,7 +4,6 @@ import {
   child,
   list,
   object,
-  boolean,
   optional,
   number,
 } from '@editor/plugin'
@@ -36,10 +35,6 @@ const exerciseGroupState = object({
       })
     )
   ),
-  /* cohesive field would indicate whether the children of a grouped exercise are cohesive
-    this field might be used in the future, but currently it has no effect and can not be changed
-    */
-  cohesive: boolean(false),
 })
 
 export type ExerciseGroupPluginState = typeof exerciseGroupState

packages/editor/src/plugins/serlo-template-plugins/exercise-group/text-exercise-group.tsx

@@ -1,5 +1,4 @@
 import {
-  boolean,
   type EditorPlugin,
   type EditorPluginProps,
   PrettyStaticState,
@@ -21,10 +20,6 @@ export const textExerciseGroupTypeState = entityType(
   {
     ...entity,
     content: editorContent(EditorPluginType.ExerciseGroup),
-    /* cohesive field would indicate whether the children of a grouped exercise are cohesive
-    this field might be used in the future, but currently it has no effect and can not be changed
-    */
-    cohesive: boolean(false),
   },
   {}
 )

packages/editor/src/plugins/serlo-template-plugins/helpers/use-handle-save.ts

@@ -1,6 +1,5 @@
 import { store, selectStaticDocument } from '@editor/store'
 import { ROOT } from '@editor/store/root/constants'
-import { TemplatePluginType } from '@editor/types/template-plugin-type'
 import type { SupportedTypesSerializedState } from '@serlo/frontend/src/mutations/use-set-entity-mutation/types'
 import { storeStateToLocalStorage } from '@serlo/frontend/src/serlo-editor-integration/components/local-storage-notice'
 import { SaveContext } from '@serlo/frontend/src/serlo-editor-integration/context/save-context'
@@ -27,16 +26,6 @@ export function useHandleSave(
   // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
   const serialized = has('state', serializedRoot) ? serializedRoot.state : null
 
-  // Currently still needed
-  if (
-    serialized !== null &&
-    serializedRoot?.plugin === TemplatePluginType.TextExerciseGroup &&
-    has('cohesive', serialized)
-  ) {
-    // backend can only handle string attributes
-    serialized.cohesive = String(serialized.cohesive)
-  }
-
   const handleSave = (
     notificationSubscription?: boolean,
     emailSubscription?: boolean,