From 67631afdd93a854040a93852085569562027160f Mon Sep 17 00:00:00 2001
From: Igor Richter <igor.richter@capgemini.com>
Date: Wed, 11 Oct 2023 17:02:14 +0200
Subject: [PATCH 01/14] add icons to new class view WIP

---
 .../administration/ClassOverview.page.vue     | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/src/pages/administration/ClassOverview.page.vue b/src/pages/administration/ClassOverview.page.vue
index 3c1e6d40b0..c351f438cb 100644
--- a/src/pages/administration/ClassOverview.page.vue
+++ b/src/pages/administration/ClassOverview.page.vue
@@ -22,6 +22,20 @@
 			@update:items-per-page="onUpdateItemsPerPage"
 			@update:page="onUpdateCurrentPage"
 		>
+			<template v-if="showIcons" v-slot:[`item.actions`]="{ item }">
+				<v-icon size="small" @click="manageClass(item)">
+					{{ mdiAccountMultipleOutline }}
+				</v-icon>
+				<v-icon size="small" @click="editItem(item)">
+					{{ mdiPencilOutline }}
+				</v-icon>
+				<v-icon size="small" @click="deleteItem(item)">
+					{{ mdiTrashCanOutline }}
+				</v-icon>
+				<v-icon size="small" @click="createSuccessor(item)">
+					{{ mdiArrowUpBoldOutline }}
+				</v-icon>
+			</template>
 		</v-data-table>
 
 		<v-btn
@@ -45,6 +59,13 @@ import { Pagination } from "@/store/types/commons";
 import { ClassInfo } from "@/store/types/class-info";
 import { GROUP_MODULE_KEY, injectStrict } from "@/utils/inject";
 import { SortOrder } from "@/store/types/sort-order.enum";
+import { authModule } from "@/store";
+import {
+	mdiPencilOutline,
+	mdiTrashCanOutline,
+	mdiArrowUpBoldOutline,
+	mdiAccountMultipleOutline,
+} from "@mdi/js";
 
 export default defineComponent({
 	components: { DefaultWireframe },
@@ -73,6 +94,25 @@ export default defineComponent({
 			() => groupModule.getClasses
 		);
 
+		/*const showIcons = (item: ClassInfo): boolean => {
+			try {
+				return (
+					!item.externalSourceName &&
+					authModule.getUserPermissions.includes("CLASS_EDIT".toLowerCase())
+				);
+			} catch (error) {
+				return false;
+			}
+		};*/
+
+		const showIcons: ComputedRef<boolean> = computed((item) => {
+			console.log(item);
+			return (
+				!item.externalSourceName &&
+				authModule.getUserPermissions.includes("CLASS_EDIT".toLowerCase())
+			);
+		});
+
 		const pagination: ComputedRef<Pagination> = computed(
 			() => groupModule.getPagination
 		);
@@ -99,8 +139,33 @@ export default defineComponent({
 				text: t("common.labels.teacher"),
 				sortable: true,
 			},
+			{
+				value: "actions",
+				text: "Hier könnte ihre Werbung stehen", // "actions"? does not exist in old table
+				sortable: false, // does it make sense to sort here?
+			},
 		];
 
+		const manageClass = (item: ClassInfo) => {
+			console.log("manage: ", item);
+		};
+
+		const editItem = (item: ClassInfo) => {
+			console.log(
+				"edit: ",
+				item,
+				authModule.getUserPermissions.includes("CLASS_EDIT".toLowerCase())
+			);
+		};
+
+		const deleteItem = (item: ClassInfo) => {
+			console.log("delete: ", item);
+		};
+
+		const createSuccessor = (item: ClassInfo) => {
+			console.log("successor: ", item);
+		};
+
 		const onUpdateSortBy = async (sortBy: string) => {
 			groupModule.setSortBy(sortBy);
 			await groupModule.loadClassesForSchool();
@@ -133,14 +198,23 @@ export default defineComponent({
 			breadcrumbs,
 			headers,
 			classes,
+			showIcons,
 			page,
 			sortBy,
 			sortOrder,
 			pagination,
+			manageClass,
+			editItem,
+			deleteItem,
+			createSuccessor,
 			onUpdateSortBy,
 			updateSortOrder,
 			onUpdateCurrentPage,
 			onUpdateItemsPerPage,
+			mdiAccountMultipleOutline,
+			mdiPencilOutline,
+			mdiTrashCanOutline,
+			mdiArrowUpBoldOutline,
 		};
 	},
 });

From 7ed64f79a0e130f4da5c99c73e1b6a260ad9d708 Mon Sep 17 00:00:00 2001
From: Igor Richter <igor.richter@capgemini.com>
Date: Thu, 12 Oct 2023 10:09:45 +0200
Subject: [PATCH 02/14] add icons to new class view

---
 .../administration/ClassOverview.page.vue     | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/pages/administration/ClassOverview.page.vue b/src/pages/administration/ClassOverview.page.vue
index c351f438cb..1e22c60034 100644
--- a/src/pages/administration/ClassOverview.page.vue
+++ b/src/pages/administration/ClassOverview.page.vue
@@ -22,17 +22,21 @@
 			@update:items-per-page="onUpdateItemsPerPage"
 			@update:page="onUpdateCurrentPage"
 		>
-			<template v-if="showIcons" v-slot:[`item.actions`]="{ item }">
+			<template v-slot:[`item.actions`]="{ item }">
 				<v-icon size="small" @click="manageClass(item)">
 					{{ mdiAccountMultipleOutline }}
 				</v-icon>
-				<v-icon size="small" @click="editItem(item)">
+				<v-icon v-if="showIcons(item)" size="small" @click="editItem(item)">
 					{{ mdiPencilOutline }}
 				</v-icon>
-				<v-icon size="small" @click="deleteItem(item)">
+				<v-icon v-if="showIcons(item)" size="small" @click="deleteItem(item)">
 					{{ mdiTrashCanOutline }}
 				</v-icon>
-				<v-icon size="small" @click="createSuccessor(item)">
+				<v-icon
+					v-if="showIcons(item)"
+					size="small"
+					@click="createSuccessor(item)"
+				>
 					{{ mdiArrowUpBoldOutline }}
 				</v-icon>
 			</template>
@@ -94,7 +98,7 @@ export default defineComponent({
 			() => groupModule.getClasses
 		);
 
-		/*const showIcons = (item: ClassInfo): boolean => {
+		const showIcons = (item: ClassInfo): boolean => {
 			try {
 				return (
 					!item.externalSourceName &&
@@ -103,15 +107,15 @@ export default defineComponent({
 			} catch (error) {
 				return false;
 			}
-		};*/
+		};
 
-		const showIcons: ComputedRef<boolean> = computed((item) => {
+		/*const showIcons: ComputedRef<boolean> = computed((item) => {
 			console.log(item);
 			return (
 				!item.externalSourceName &&
 				authModule.getUserPermissions.includes("CLASS_EDIT".toLowerCase())
 			);
-		});
+		});*/
 
 		const pagination: ComputedRef<Pagination> = computed(
 			() => groupModule.getPagination

From b8eb1625b90508938ac0f73bf9f6333f83b5663b Mon Sep 17 00:00:00 2001
From: Igor Richter <igor.richter@capgemini.com>
Date: Thu, 12 Oct 2023 10:14:35 +0200
Subject: [PATCH 03/14] cleanup

---
 .../administration/ClassOverview.page.vue     | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/pages/administration/ClassOverview.page.vue b/src/pages/administration/ClassOverview.page.vue
index 1e22c60034..abcd580cd8 100644
--- a/src/pages/administration/ClassOverview.page.vue
+++ b/src/pages/administration/ClassOverview.page.vue
@@ -98,24 +98,9 @@ export default defineComponent({
 			() => groupModule.getClasses
 		);
 
-		const showIcons = (item: ClassInfo): boolean => {
-			try {
-				return (
-					!item.externalSourceName &&
-					authModule.getUserPermissions.includes("CLASS_EDIT".toLowerCase())
-				);
-			} catch (error) {
-				return false;
-			}
-		};
-
-		/*const showIcons: ComputedRef<boolean> = computed((item) => {
-			console.log(item);
-			return (
-				!item.externalSourceName &&
-				authModule.getUserPermissions.includes("CLASS_EDIT".toLowerCase())
-			);
-		});*/
+		const showIcons = (item: ClassInfo): boolean =>
+			!item.externalSourceName &&
+			authModule.getUserPermissions.includes("CLASS_EDIT".toLowerCase());
 
 		const pagination: ComputedRef<Pagination> = computed(
 			() => groupModule.getPagination

From 88e689793c90fdad53515bbbe3bcf9da0bd7818c Mon Sep 17 00:00:00 2001
From: Igor Richter <igor.richter@capgemini.com>
Date: Thu, 12 Oct 2023 16:06:46 +0200
Subject: [PATCH 04/14] functionality for action icons and new locales

---
 src/locales/de.json                           |   2 +
 src/locales/en.json                           |   2 +
 src/locales/es.json                           |   2 +
 src/locales/uk.json                           |   2 +
 .../administration/ClassOverview.page.vue     | 153 +++++++++++++++---
 5 files changed, 136 insertions(+), 25 deletions(-)

diff --git a/src/locales/de.json b/src/locales/de.json
index 5dc3162536..a0d01962ba 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -736,6 +736,8 @@
 	"pages.administration.school.index.authSystems.delete": "{system} löschen",
 	"pages.administration.classes.index.title": "Klassen verwalten",
 	"pages.administration.classes.index.add": "Klasse hinzufügen",
+	"pages.administration.classes.deleteDialog.title": "Klasse löschen?",
+	"pages.administration.classes.deleteDialog.content": "\"Möchten Sie wirklich die Klasse '<i>{itemName}</i>' löschen?\"",
 	"pages.content._id.addToTopic": "Hinzufügen zu",
 	"pages.content._id.collection.selectElements": "Wählen Sie die Elemente, die Sie zum Thema hinzufügen möchten",
 	"pages.content._id.metadata.author": "Autor",
diff --git a/src/locales/en.json b/src/locales/en.json
index 022e57571c..82b67b5feb 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -734,6 +734,8 @@
 	"pages.administration.school.index.authSystems.delete": "Delete {system}",
 	"pages.administration.classes.index.title": "Manage classes",
 	"pages.administration.classes.index.add": "Add class",
+	"pages.administration.classes.deleteDialog.title": "Delete class?",
+	"pages.administration.classes.deleteDialog.content": "\"Are you sure you want to delete class '<i>{itemName}<i>'?\"",
 	"pages.content._id.addToTopic": "To be added to",
 	"pages.content._id.collection.selectElements": "Select the items you want to add to the topic",
 	"pages.content._id.metadata.author": "Author",
diff --git a/src/locales/es.json b/src/locales/es.json
index 1ea67e8f36..44458fc295 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -723,6 +723,8 @@
 	"pages.administration.school.index.authSystems.delete": "Eliminar {system}",
 	"pages.administration.classes.index.title": "Administrar clases",
 	"pages.administration.classes.index.add": "Agregar clase",
+	"pages.administration.classes.deleteDialog.title": "¿Eliminar clase?",
+	"pages.administration.classes.deleteDialog.content": "\"¿Está seguro de que desea eliminar la clase '<i>{itemName}<i>'?\"",
 	"pages.content._id.addToTopic": "Para ser añadido a",
 	"pages.content._id.collection.selectElements": "Selecciona los elementos que deses añadir al tema",
 	"pages.content._id.metadata.author": "Autor",
diff --git a/src/locales/uk.json b/src/locales/uk.json
index e931df6349..039d958eb1 100644
--- a/src/locales/uk.json
+++ b/src/locales/uk.json
@@ -811,6 +811,8 @@
 	"pages.administration.teachers.table.edit.ariaLabel": "Редагування вчителя",
 	"pages.administration.classes.index.title": "Керувати заняттями",
 	"pages.administration.classes.index.add": "Додати клас",
+	"pages.administration.classes.deleteDialog.title": "Видалити клас?",
+	"pages.administration.classes.deleteDialog.content": "\"Ви впевнені, що хочете видалити клас \"<i>{itemName}<i>\"?\"",
 	"pages.content._id.addToTopic": "Для додавання в",
 	"pages.content._id.collection.selectElements": "Виберіть елементи, які треба додати до теми",
 	"pages.content._id.metadata.author": "Автор",
diff --git a/src/pages/administration/ClassOverview.page.vue b/src/pages/administration/ClassOverview.page.vue
index abcd580cd8..66d84afd19 100644
--- a/src/pages/administration/ClassOverview.page.vue
+++ b/src/pages/administration/ClassOverview.page.vue
@@ -23,17 +23,29 @@
 			@update:page="onUpdateCurrentPage"
 		>
 			<template v-slot:[`item.actions`]="{ item }">
-				<v-icon size="small" @click="manageClass(item)">
+				<v-icon
+					v-if="hasPermission && !item.externalSourceName"
+					size="small"
+					@click="manageClass(item)"
+				>
 					{{ mdiAccountMultipleOutline }}
 				</v-icon>
-				<v-icon v-if="showIcons(item)" size="small" @click="editItem(item)">
+				<v-icon
+					v-if="hasPermission && !item.externalSourceName"
+					size="small"
+					@click="editItem(item)"
+				>
 					{{ mdiPencilOutline }}
 				</v-icon>
-				<v-icon v-if="showIcons(item)" size="small" @click="deleteItem(item)">
+				<v-icon
+					v-if="hasPermission && !item.externalSourceName"
+					size="small"
+					@click="onOpenDeleteDialog(item)"
+				>
 					{{ mdiTrashCanOutline }}
 				</v-icon>
 				<v-icon
-					v-if="showIcons(item)"
+					v-if="hasPermission && !item.externalSourceName"
 					size="small"
 					@click="createSuccessor(item)"
 				>
@@ -42,6 +54,51 @@
 			</template>
 		</v-data-table>
 
+		<v-dialog
+			v-model="isDeleteDialogOpen"
+			max-width="360"
+			data-testId="delete-dialog"
+		>
+			<v-card :ripple="false">
+				<v-card-title>
+					<h2 class="text-h4 my-2">
+						{{ t("pages.administration.classes.deleteDialog.title") }}
+					</h2>
+				</v-card-title>
+				<v-card-text class="text--primary">
+					<RenderHTML
+						class="text-md mt-2"
+						:html="
+							t('pages.administration.classes.deleteDialog.content', {
+								itemName: selectedItemName,
+							})
+						"
+						component="p"
+					/>
+				</v-card-text>
+				<v-card-actions>
+					<v-spacer></v-spacer>
+					<v-btn
+						data-testId="dialog-cancel"
+						depressed
+						text
+						@click="onCloseDeleteDialog"
+					>
+						{{ t("common.actions.cancel") }}
+					</v-btn>
+					<v-btn
+						data-testId="dialog-confirm"
+						class="px-6"
+						color="primary"
+						depressed
+						@click="onDeleteClass"
+					>
+						{{ t("common.actions.confirm") }}
+					</v-btn>
+				</v-card-actions>
+			</v-card>
+		</v-dialog>
+
 		<v-btn
 			class="my-5 button-start"
 			color="primary"
@@ -54,9 +111,17 @@
 </template>
 
 <script lang="ts">
+import { RenderHTML } from "@feature-render-html";
 import { Breadcrumb } from "@/components/templates/default-wireframe.types";
 import DefaultWireframe from "@/components/templates/DefaultWireframe.vue";
-import { computed, ComputedRef, defineComponent, onMounted } from "vue";
+import {
+	computed,
+	ComputedRef,
+	defineComponent,
+	onMounted,
+	ref,
+	Ref,
+} from "vue";
 import GroupModule from "@/store/group";
 import { useI18n } from "@/composables/i18n.composable";
 import { Pagination } from "@/store/types/commons";
@@ -70,9 +135,12 @@ import {
 	mdiArrowUpBoldOutline,
 	mdiAccountMultipleOutline,
 } from "@mdi/js";
+import VueRouter from "vue-router";
+import { useRouter } from "vue-router/composables";
+import axios from "axios";
 
 export default defineComponent({
-	components: { DefaultWireframe },
+	components: { DefaultWireframe, RenderHTML },
 	setup() {
 		const groupModule: GroupModule = injectStrict(GROUP_MODULE_KEY);
 
@@ -98,9 +166,27 @@ export default defineComponent({
 			() => groupModule.getClasses
 		);
 
-		const showIcons = (item: ClassInfo): boolean =>
-			!item.externalSourceName &&
-			authModule.getUserPermissions.includes("CLASS_EDIT".toLowerCase());
+		const hasPermission: ComputedRef<boolean> = computed(() =>
+			authModule.getUserPermissions.includes("CLASS_EDIT".toLowerCase())
+		);
+
+		const isDeleteDialogOpen: Ref<boolean> = ref(false);
+
+		const selectedItem: Ref<ClassInfo | undefined> = ref();
+
+		const selectedItemName: ComputedRef<string> = computed(
+			() => selectedItem.value?.name || "???"
+		);
+
+		const onOpenDeleteDialog = (selectedClass: ClassInfo) => {
+			selectedItem.value = selectedClass;
+			isDeleteDialogOpen.value = true;
+		};
+
+		const onCloseDeleteDialog = () => {
+			selectedItem.value = undefined;
+			isDeleteDialogOpen.value = false;
+		};
 
 		const pagination: ComputedRef<Pagination> = computed(
 			() => groupModule.getPagination
@@ -130,29 +216,41 @@ export default defineComponent({
 			},
 			{
 				value: "actions",
-				text: "Hier könnte ihre Werbung stehen", // "actions"? does not exist in old table
-				sortable: false, // does it make sense to sort here?
+				text: "",
+				sortable: false,
 			},
 		];
 
-		const manageClass = (item: ClassInfo) => {
-			console.log("manage: ", item);
+		const router: VueRouter = useRouter();
+
+		const tempClassId = "6527efc4535aa75bf803e31b";
+
+		const manageClass = async (item: ClassInfo) => {
+			await router.push({
+				path: `/administration/classes/${tempClassId}/manage`,
+			}); //TODO replace tempClassId with item.id after N21-939 is merged
 		};
 
-		const editItem = (item: ClassInfo) => {
-			console.log(
-				"edit: ",
-				item,
-				authModule.getUserPermissions.includes("CLASS_EDIT".toLowerCase())
-			);
+		const editItem = async (item: ClassInfo) => {
+			await router.push({
+				path: `/administration/classes/${tempClassId}/edit`,
+			}); //TODO replace tempClassId with item.id after N21-939 is merged
 		};
 
-		const deleteItem = (item: ClassInfo) => {
-			console.log("delete: ", item);
+		const onDeleteClass = async () => {
+			if (selectedItem.value) {
+				await axios.delete(`/v1/classes/${tempClassId}`);
+				await groupModule.loadClassesForSchool();
+				//TODO replace tempClassId with item.id after N21-939 is merged
+			}
+
+			onCloseDeleteDialog();
 		};
 
-		const createSuccessor = (item: ClassInfo) => {
-			console.log("successor: ", item);
+		const createSuccessor = async (item: ClassInfo) => {
+			await router.push({
+				path: `/administration/classes/${tempClassId}/createSuccessor`, //TODO replace tempClassId with item.id after N21-939 is merged
+			});
 		};
 
 		const onUpdateSortBy = async (sortBy: string) => {
@@ -187,14 +285,19 @@ export default defineComponent({
 			breadcrumbs,
 			headers,
 			classes,
-			showIcons,
+			hasPermission,
 			page,
 			sortBy,
 			sortOrder,
 			pagination,
+			selectedItem,
+			selectedItemName,
+			isDeleteDialogOpen,
+			onOpenDeleteDialog,
+			onCloseDeleteDialog,
+			onDeleteClass,
 			manageClass,
 			editItem,
-			deleteItem,
 			createSuccessor,
 			onUpdateSortBy,
 			updateSortOrder,

From e7f16e76a8ecca24337c2af63b3b3bf2ddfc8dc3 Mon Sep 17 00:00:00 2001
From: Igor Richter <igor.richter@capgemini.com>
Date: Fri, 13 Oct 2023 14:55:14 +0200
Subject: [PATCH 05/14] unit test WIP

---
 .../administration/ClassOverview.page.unit.ts | 54 ++++++++++++++++++-
 .../administration/ClassOverview.page.vue     |  4 ++
 tests/test-utils/factory/classInfoFactory.ts  |  8 +++
 3 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 tests/test-utils/factory/classInfoFactory.ts

diff --git a/src/pages/administration/ClassOverview.page.unit.ts b/src/pages/administration/ClassOverview.page.unit.ts
index 2ee0c1e986..ae03d47ea7 100644
--- a/src/pages/administration/ClassOverview.page.unit.ts
+++ b/src/pages/administration/ClassOverview.page.unit.ts
@@ -1,6 +1,10 @@
 import GroupModule from "@/store/group";
 import { createModuleMocks } from "@/utils/mock-store-module";
-import { classInfoResponseFactory, i18nMock } from "@@/tests/test-utils";
+import {
+	classInfoResponseFactory,
+	i18nMock,
+	mockUser,
+} from "@@/tests/test-utils";
 import { MountOptions, Wrapper, mount } from "@vue/test-utils";
 import ClassOverview from "./ClassOverview.page.vue";
 import { GROUP_MODULE_KEY, I18N_KEY } from "@/utils/inject";
@@ -8,6 +12,14 @@ import createComponentMocks from "@@/tests/test-utils/componentMocks";
 import Vue from "vue";
 import { SortOrder } from "@/store/types/sort-order.enum";
 import { Pagination } from "@/store/types/commons";
+import setupStores from "../../../tests/test-utils/setupStores";
+import AuthModule from "../../store/auth";
+import { ClassInfo } from "../../store/types/class-info";
+import { authModule } from "../../store";
+
+const $router = {
+	push: jest.fn(),
+};
 
 describe("ClassOverview", () => {
 	const getWrapper = (getters: Partial<GroupModule> = {}) => {
@@ -31,6 +43,7 @@ describe("ClassOverview", () => {
 				[I18N_KEY.valueOf()]: i18nMock,
 				[GROUP_MODULE_KEY.valueOf()]: groupModule,
 			},
+			mocks: { $router },
 		});
 
 		return {
@@ -39,6 +52,13 @@ describe("ClassOverview", () => {
 		};
 	};
 
+	beforeEach(() => {
+		$router.push.mockReset();
+		setupStores({
+			authModule: AuthModule,
+		});
+	});
+
 	afterEach(() => {
 		jest.clearAllMocks();
 	});
@@ -202,4 +222,36 @@ describe("ClassOverview", () => {
 			});
 		});
 	});
+
+	describe("manageClass", () => {
+		describe("when clicking on the manage class icon", () => {
+			const setup = () => {
+				const clazz: ClassInfo = classInfoResponseFactory.build({
+					externalSourceName: undefined,
+				});
+
+				authModule.addUserPermmission("CLASS_EDIT");
+
+				const { wrapper, groupModule } = getWrapper();
+
+				groupModule.setClasses([clazz]);
+
+				return {
+					wrapper,
+				};
+			};
+
+			it("should redirect to legacy class manage page", async () => {
+				const { wrapper } = setup();
+
+				await wrapper
+					.find('[data-testid="class-table-manage-icon"]')
+					.trigger("click");
+
+				expect($router.push).toHaveBeenCalledWith(
+					`/administration/classes/6527efc4535aa75bf803e31b/manage`
+				);
+			});
+		});
+	});
 });
diff --git a/src/pages/administration/ClassOverview.page.vue b/src/pages/administration/ClassOverview.page.vue
index 66d84afd19..d6652fb3fe 100644
--- a/src/pages/administration/ClassOverview.page.vue
+++ b/src/pages/administration/ClassOverview.page.vue
@@ -26,6 +26,7 @@
 				<v-icon
 					v-if="hasPermission && !item.externalSourceName"
 					size="small"
+					data-testid="class-table-manage-icon"
 					@click="manageClass(item)"
 				>
 					{{ mdiAccountMultipleOutline }}
@@ -33,6 +34,7 @@
 				<v-icon
 					v-if="hasPermission && !item.externalSourceName"
 					size="small"
+					data-testid="class-table-edit-icon"
 					@click="editItem(item)"
 				>
 					{{ mdiPencilOutline }}
@@ -40,6 +42,7 @@
 				<v-icon
 					v-if="hasPermission && !item.externalSourceName"
 					size="small"
+					data-testid="class-table-delete-icon"
 					@click="onOpenDeleteDialog(item)"
 				>
 					{{ mdiTrashCanOutline }}
@@ -47,6 +50,7 @@
 				<v-icon
 					v-if="hasPermission && !item.externalSourceName"
 					size="small"
+					data-testid="class-table-sucessor-icon"
 					@click="createSuccessor(item)"
 				>
 					{{ mdiArrowUpBoldOutline }}
diff --git a/tests/test-utils/factory/classInfoFactory.ts b/tests/test-utils/factory/classInfoFactory.ts
new file mode 100644
index 0000000000..11e0df6afe
--- /dev/null
+++ b/tests/test-utils/factory/classInfoFactory.ts
@@ -0,0 +1,8 @@
+import { Factory } from "fishery";
+import { ClassInfo } from "@/store/types/class-info";
+
+export const classInfoFactory = Factory.define<ClassInfo>(() => ({
+	name: "className",
+	externalSourceName: "Source",
+	teachers: ["TestTeacher"],
+}));

From 85650b72b2225628dd0944945b0cf384fb04b200 Mon Sep 17 00:00:00 2001
From: Igor Richter <igor.richter@capgemini.com>
Date: Mon, 16 Oct 2023 16:15:16 +0200
Subject: [PATCH 06/14] unit tests, todos, merge main

---
 .../administration/ClassOverview.page.unit.ts | 253 ++++++++++++++++--
 .../administration/ClassOverview.page.vue     |  32 +--
 src/serverApi/v3/api.ts                       |   8 +-
 src/store/group.ts                            |  20 ++
 src/store/group.unit.ts                       |  61 +++++
 src/store/group/group.mapper.ts               |   1 +
 src/store/types/class-info.ts                 |   1 +
 7 files changed, 342 insertions(+), 34 deletions(-)

diff --git a/src/pages/administration/ClassOverview.page.unit.ts b/src/pages/administration/ClassOverview.page.unit.ts
index e0ee5414fc..78732bd874 100644
--- a/src/pages/administration/ClassOverview.page.unit.ts
+++ b/src/pages/administration/ClassOverview.page.unit.ts
@@ -1,9 +1,6 @@
 import GroupModule from "@/store/group";
 import { createModuleMocks } from "@/utils/mock-store-module";
-import {
-	classInfoFactory,
-	i18nMock,
-} from "@@/tests/test-utils";
+import { classInfoFactory, i18nMock } from "@@/tests/test-utils";
 import { MountOptions, Wrapper, mount } from "@vue/test-utils";
 import ClassOverview from "./ClassOverview.page.vue";
 import { GROUP_MODULE_KEY, I18N_KEY } from "@/utils/inject";
@@ -13,7 +10,6 @@ import { SortOrder } from "@/store/types/sort-order.enum";
 import { Pagination } from "@/store/types/commons";
 import setupStores from "../../../tests/test-utils/setupStores";
 import AuthModule from "../../store/auth";
-import { ClassInfo } from "../../store/types/class-info";
 import { authModule } from "../../store";
 
 const $router = {
@@ -25,7 +21,13 @@ describe("ClassOverview", () => {
 		document.body.setAttribute("data-app", "true");
 
 		const groupModule = createModuleMocks(GroupModule, {
-			getClasses: [classInfoFactory.build()],
+			getClasses: [
+				classInfoFactory.build(),
+				classInfoFactory.build({
+					externalSourceName: "",
+					isUpgradable: true,
+				}),
+			],
 			getPagination: {
 				limit: 10,
 				skip: 0,
@@ -222,34 +224,255 @@ describe("ClassOverview", () => {
 		});
 	});
 
-	describe("manageClass", () => {
-		describe("when clicking on the manage class icon", () => {
+	describe("action icons", () => {
+		describe("when classes are available", () => {
+			const setup = () => {
+				authModule.addUserPermmission("CLASS_EDIT");
+
+				const { wrapper } = getWrapper();
+
+				return {
+					wrapper,
+				};
+			};
+
+			it("should render 4 icons", () => {
+				const { wrapper } = setup();
+
+				const manageIcon = wrapper.find(
+					'[data-testid="class-table-manage-icon"]'
+				);
+
+				const editIcon = wrapper.find('[data-testid="class-table-edit-icon"]');
+
+				const deleteIcon = wrapper.find(
+					'[data-testid="class-table-delete-icon"]'
+				);
+
+				const successorIcon = wrapper.find(
+					'[data-testid="class-table-successor-icon"]'
+				);
+
+				expect(manageIcon.exists()).toBeTruthy();
+				expect(editIcon.exists()).toBeTruthy();
+				expect(deleteIcon.exists()).toBeTruthy();
+				expect(successorIcon.exists()).toBeTruthy();
+			});
+		});
+
+		describe("when no classes are available", () => {
 			const setup = () => {
-				const clazz: ClassInfo = classInfoResponseFactory.build({
-					externalSourceName: undefined,
+				authModule.addUserPermmission("CLASS_EDIT");
+
+				const { wrapper } = getWrapper({
+					getClasses: [classInfoFactory.build()],
 				});
 
+				return {
+					wrapper,
+				};
+			};
+
+			it("should not render any icons", () => {
+				const { wrapper } = setup();
+
+				const manageIcon = wrapper.find(
+					'[data-testid="class-table-manage-icon"]'
+				);
+
+				const editIcon = wrapper.find('[data-testid="class-table-edit-icon"]');
+
+				const deleteIcon = wrapper.find(
+					'[data-testid="class-table-delete-icon"]'
+				);
+
+				const successorIcon = wrapper.find(
+					'[data-testid="class-table-successor-icon"]'
+				);
+
+				expect(manageIcon.exists()).toBeFalsy();
+				expect(editIcon.exists()).toBeFalsy();
+				expect(deleteIcon.exists()).toBeFalsy();
+				expect(successorIcon.exists()).toBeFalsy();
+			});
+		});
+
+		describe("when clicking on the manage class icon", () => {
+			const setup = () => {
 				authModule.addUserPermmission("CLASS_EDIT");
 
 				const { wrapper, groupModule } = getWrapper();
 
-				groupModule.setClasses([clazz]);
+				const classId: string = groupModule.getClasses[1].id;
 
 				return {
 					wrapper,
+					classId,
 				};
 			};
 
 			it("should redirect to legacy class manage page", async () => {
-				const { wrapper } = setup();
+				const { wrapper, classId } = setup();
 
 				await wrapper
 					.find('[data-testid="class-table-manage-icon"]')
 					.trigger("click");
 
-				expect($router.push).toHaveBeenCalledWith(
-					`/administration/classes/6527efc4535aa75bf803e31b/manage`
-				);
+				expect($router.push).toHaveBeenCalledWith({
+					path: `/administration/classes/${classId}/manage`,
+				});
+			});
+		});
+
+		describe("when clicking on the edit class icon", () => {
+			const setup = () => {
+				authModule.addUserPermmission("CLASS_EDIT");
+
+				const { wrapper, groupModule } = getWrapper();
+
+				const classId: string = groupModule.getClasses[1].id;
+
+				return {
+					wrapper,
+					classId,
+				};
+			};
+
+			it("should redirect to legacy class edit page", async () => {
+				const { wrapper, classId } = setup();
+
+				await wrapper
+					.find('[data-testid="class-table-edit-icon"]')
+					.trigger("click");
+
+				expect($router.push).toHaveBeenCalledWith({
+					path: `/administration/classes/${classId}/edit`,
+				});
+			});
+		});
+
+		describe("when class is upgradable", () => {
+			describe("when clicking on the upgrade class icon", () => {
+				const setup = () => {
+					authModule.addUserPermmission("CLASS_EDIT");
+
+					const { wrapper, groupModule } = getWrapper();
+
+					const classId: string = groupModule.getClasses[1].id;
+
+					return {
+						wrapper,
+						classId,
+					};
+				};
+
+				it("should redirect to legacy class upgrade page", async () => {
+					const { wrapper, classId } = setup();
+
+					await wrapper
+						.find('[data-testid="class-table-successor-icon"]')
+						.trigger("click");
+
+					expect($router.push).toHaveBeenCalledWith({
+						path: `/administration/classes/${classId}/createSuccessor`,
+					});
+				});
+			});
+		});
+
+		describe("when class is not upgradable", () => {
+			const setup = () => {
+				authModule.addUserPermmission("CLASS_EDIT");
+
+				const { wrapper } = getWrapper({
+					getClasses: [
+						classInfoFactory.build({
+							externalSourceName: undefined,
+							isUpgradable: false,
+						}),
+					],
+				});
+
+				return {
+					wrapper,
+				};
+			};
+
+			it("should display the upgrade icon as disabled", () => {
+				const { wrapper } = setup();
+
+				const icon = wrapper.find('[data-testid="class-table-successor-icon"]');
+
+				expect(icon.attributes().disabled).toBe("disabled");
+			});
+		});
+
+		describe("when clicking on the delete class icon", () => {
+			const setup = () => {
+				authModule.addUserPermmission("CLASS_EDIT");
+
+				const { wrapper } = getWrapper();
+
+				return {
+					wrapper,
+				};
+			};
+
+			it("should open the delete dialog", async () => {
+				const { wrapper } = setup();
+
+				await wrapper
+					.find('[data-testid="class-table-delete-icon"]')
+					.trigger("click");
+
+				const dialog = wrapper.find('[data-testid="delete-dialog"]');
+
+				expect(dialog.exists()).toBeTruthy();
+			});
+		});
+
+		describe("when delete dialog is open", () => {
+			const setup = () => {
+				authModule.addUserPermmission("CLASS_EDIT");
+
+				const { wrapper, groupModule } = getWrapper();
+
+				return {
+					wrapper,
+					groupModule,
+				};
+			};
+
+			describe("when clicking on cancel button", () => {
+				it("should not delete class", async () => {
+					const { wrapper, groupModule } = setup();
+
+					await wrapper
+						.find('[data-testid="class-table-delete-icon"]')
+						.trigger("click");
+
+					const dialog = wrapper.find('[data-testid="delete-dialog"]');
+
+					await dialog.find('[data-testid="dialog-cancel"').trigger("click");
+
+					expect(groupModule.deleteClass).not.toHaveBeenCalled();
+				});
+			});
+
+			describe("when clicking on confirm button", () => {
+				it("should delete class", async () => {
+					const { wrapper, groupModule } = setup();
+
+					await wrapper
+						.find('[data-testid="class-table-delete-icon"]')
+						.trigger("click");
+
+					const dialog = wrapper.find('[data-testid="delete-dialog"]');
+
+					await dialog.find('[data-testid="dialog-confirm"').trigger("click");
+
+					expect(groupModule.deleteClass).toHaveBeenCalled();
+				});
 			});
 		});
 	});
diff --git a/src/pages/administration/ClassOverview.page.vue b/src/pages/administration/ClassOverview.page.vue
index d6652fb3fe..283580f07c 100644
--- a/src/pages/administration/ClassOverview.page.vue
+++ b/src/pages/administration/ClassOverview.page.vue
@@ -29,7 +29,7 @@
 					data-testid="class-table-manage-icon"
 					@click="manageClass(item)"
 				>
-					{{ mdiAccountMultipleOutline }}
+					{{ mdiAccountGroupOutline }}
 				</v-icon>
 				<v-icon
 					v-if="hasPermission && !item.externalSourceName"
@@ -49,11 +49,12 @@
 				</v-icon>
 				<v-icon
 					v-if="hasPermission && !item.externalSourceName"
+					:disabled="!item.isUpgradable"
 					size="small"
-					data-testid="class-table-sucessor-icon"
+					data-testid="class-table-successor-icon"
 					@click="createSuccessor(item)"
 				>
-					{{ mdiArrowUpBoldOutline }}
+					{{ mdiArrowUp }}
 				</v-icon>
 			</template>
 		</v-data-table>
@@ -136,12 +137,11 @@ import { authModule } from "@/store";
 import {
 	mdiPencilOutline,
 	mdiTrashCanOutline,
-	mdiArrowUpBoldOutline,
-	mdiAccountMultipleOutline,
+	mdiArrowUp,
+	mdiAccountGroupOutline,
 } from "@mdi/js";
 import VueRouter from "vue-router";
 import { useRouter } from "vue-router/composables";
-import axios from "axios";
 
 export default defineComponent({
 	components: { DefaultWireframe, RenderHTML },
@@ -227,25 +227,21 @@ export default defineComponent({
 
 		const router: VueRouter = useRouter();
 
-		const tempClassId = "6527efc4535aa75bf803e31b";
-
 		const manageClass = async (item: ClassInfo) => {
 			await router.push({
-				path: `/administration/classes/${tempClassId}/manage`,
-			}); //TODO replace tempClassId with item.id after N21-939 is merged
+				path: `/administration/classes/${item.id}/manage`,
+			});
 		};
 
 		const editItem = async (item: ClassInfo) => {
 			await router.push({
-				path: `/administration/classes/${tempClassId}/edit`,
-			}); //TODO replace tempClassId with item.id after N21-939 is merged
+				path: `/administration/classes/${item.id}/edit`,
+			});
 		};
 
 		const onDeleteClass = async () => {
 			if (selectedItem.value) {
-				await axios.delete(`/v1/classes/${tempClassId}`);
-				await groupModule.loadClassesForSchool();
-				//TODO replace tempClassId with item.id after N21-939 is merged
+				await groupModule.deleteClass(selectedItem.value.id);
 			}
 
 			onCloseDeleteDialog();
@@ -253,7 +249,7 @@ export default defineComponent({
 
 		const createSuccessor = async (item: ClassInfo) => {
 			await router.push({
-				path: `/administration/classes/${tempClassId}/createSuccessor`, //TODO replace tempClassId with item.id after N21-939 is merged
+				path: `/administration/classes/${item.id}/createSuccessor`,
 			});
 		};
 
@@ -307,10 +303,10 @@ export default defineComponent({
 			updateSortOrder,
 			onUpdateCurrentPage,
 			onUpdateItemsPerPage,
-			mdiAccountMultipleOutline,
+			mdiAccountGroupOutline,
 			mdiPencilOutline,
 			mdiTrashCanOutline,
-			mdiArrowUpBoldOutline,
+			mdiArrowUp,
 		};
 	},
 });
diff --git a/src/serverApi/v3/api.ts b/src/serverApi/v3/api.ts
index 9eb2f0fcf6..80bcf6a50b 100644
--- a/src/serverApi/v3/api.ts
+++ b/src/serverApi/v3/api.ts
@@ -401,6 +401,12 @@ export interface ClassInfoResponse {
      * @memberof ClassInfoResponse
      */
     schoolYear?: string;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ClassInfoResponse
+     */
+    isUpgradable?: boolean;
 }
 
 /**
@@ -3263,7 +3269,7 @@ export interface OauthConfigResponse {
      * @type {string}
      * @memberof OauthConfigResponse
      */
-    logoutEndpoint: string;
+    logoutEndpoint?: string;
     /**
      * Issuer
      * @type {string}
diff --git a/src/store/group.ts b/src/store/group.ts
index cb9c751f24..2ae36132b4 100644
--- a/src/store/group.ts
+++ b/src/store/group.ts
@@ -104,6 +104,26 @@ export default class GroupModule extends VuexModule {
 		this.page = page;
 	}
 
+	@Action
+	async deleteClass(classId: string): Promise<void> {
+		this.setLoading(true);
+		try {
+			await $axios.delete(`/v1/classes/${classId}`);
+			await this.loadClassesForSchool();
+		} catch (error) {
+			const apiError = mapAxiosErrorToResponseError(error);
+
+			console.log(apiError);
+
+			this.setBusinessError({
+				error: apiError,
+				statusCode: apiError.code,
+				message: `${apiError.type}: ${apiError.message}`,
+			});
+		}
+		this.setLoading(false);
+	}
+
 	@Action
 	async loadClassesForSchool(): Promise<void> {
 		this.setLoading(true);
diff --git a/src/store/group.unit.ts b/src/store/group.unit.ts
index 074411b43b..0fdb56760b 100644
--- a/src/store/group.unit.ts
+++ b/src/store/group.unit.ts
@@ -17,6 +17,8 @@ import GroupModule from "./group";
 import { createMock, DeepMocked } from "@golevelup/ts-jest";
 import { mockApiResponse } from "@@/tests/test-utils/mockApiResponse";
 import { mapAxiosErrorToResponseError } from "@/utils/api";
+import { classInfoFactory } from "../../tests/test-utils/factory/classInfoFactory";
+import axios from "axios/index";
 
 describe("GroupModule", () => {
 	let module: GroupModule;
@@ -257,4 +259,63 @@ describe("GroupModule", () => {
 			});
 		});
 	});
+
+	// TODO test deleteClass method by mocking the v1 axios call
+	describe("deleteClass", () => {
+		describe("when called", () => {
+			const setup = () => {
+				const clazz: ClassInfo = classInfoFactory.build();
+				const classId = clazz.id;
+
+				return {
+					classId,
+				};
+			};
+
+			it("should delete the class", async () => {
+				const { classId } = setup();
+
+				await module.deleteClass(classId);
+
+				expect(axios.delete).toHaveBeenCalled();
+			});
+
+			it("should load classes", async () => {
+				const { classId } = setup();
+
+				await module.deleteClass(classId);
+
+				expect(module.loadClassesForSchool).toHaveBeenCalled();
+				expect(module.getClasses).toEqual([]);
+			});
+		});
+
+		describe("when error is returned", () => {
+			const setup = () => {
+				const error = axiosErrorFactory.build();
+				const apiError = mapAxiosErrorToResponseError(error);
+				const clazz: ClassInfo = classInfoFactory.build();
+				const classId = clazz.id;
+
+				module.loadClassesForSchool.mockRejectedValue(error);
+
+				return {
+					apiError,
+					classId,
+				};
+			};
+
+			it("should update the stores error", async () => {
+				const { apiError, classId } = setup();
+
+				await module.deleteClass(classId);
+
+				expect(module.getBusinessError).toEqual<BusinessError>({
+					error: apiError,
+					statusCode: apiError.code,
+					message: `${apiError.type}: ${apiError.message}`,
+				});
+			});
+		});
+	});
 });
diff --git a/src/store/group/group.mapper.ts b/src/store/group/group.mapper.ts
index 8335273cfd..602b759f63 100644
--- a/src/store/group/group.mapper.ts
+++ b/src/store/group/group.mapper.ts
@@ -18,6 +18,7 @@ export class GroupMapper {
 				teachers: classInfoResponse.teachers,
 				type: ClassRootTypeMapping[classInfoResponse.type],
 				id: classInfoResponse.id,
+				isUpgradable: classInfoResponse.isUpgradable,
 			})
 		);
 
diff --git a/src/store/types/class-info.ts b/src/store/types/class-info.ts
index 22080dd13a..bb36fe2ac2 100644
--- a/src/store/types/class-info.ts
+++ b/src/store/types/class-info.ts
@@ -4,6 +4,7 @@ export type ClassInfo = {
 	teachers: string[];
 	type: ClassRootType;
 	id: string;
+	isUpgradable?: boolean;
 };
 
 export enum ClassRootType {

From 327d72a80b7abde751779340ec63e4e8e4ae896c Mon Sep 17 00:00:00 2001
From: Igor Richter <igor.richter@capgemini.com>
Date: Thu, 19 Oct 2023 12:24:11 +0200
Subject: [PATCH 07/14] request changes, merge main

---
 src/locales/de.json                           |   6 +-
 src/locales/en.json                           |   6 +-
 src/locales/es.json                           |   6 +-
 src/locales/uk.json                           |   6 +-
 .../administration/ClassOverview.page.unit.ts |   8 +-
 .../administration/ClassOverview.page.vue     | 139 +++++++++---------
 src/store/group.unit.ts                       |   3 +-
 7 files changed, 93 insertions(+), 81 deletions(-)

diff --git a/src/locales/de.json b/src/locales/de.json
index 9094a13c24..13b0728059 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -745,7 +745,11 @@
 	"pages.administration.classes.index.title": "Klassen verwalten",
 	"pages.administration.classes.index.add": "Klasse hinzufügen",
 	"pages.administration.classes.deleteDialog.title": "Klasse löschen?",
-	"pages.administration.classes.deleteDialog.content": "\"Möchten Sie wirklich die Klasse '<i>{itemName}</i>' löschen?\"",
+	"pages.administration.classes.deleteDialog.content": "Möchten Sie wirklich die Klasse \"<i>{itemName}</i>\" löschen?",
+	"pages.administration.classes.manage": "Klasse verwalten",
+	"pages.administration.classes.edit": "Klasse bearbeiten",
+	"pages.administration.classes.delete": "Klasse löschen",
+	"pages.administration.classes.createSuccessor": "Klasse in das nächste Schuljahr versetzen",
 	"pages.content._id.addToTopic": "Hinzufügen zu",
 	"pages.content._id.collection.selectElements": "Wählen Sie die Elemente, die Sie zum Thema hinzufügen möchten",
 	"pages.content._id.metadata.author": "Autor",
diff --git a/src/locales/en.json b/src/locales/en.json
index 81e7c3f4cc..7a7427e4d9 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -743,7 +743,11 @@
 	"pages.administration.classes.index.title": "Manage classes",
 	"pages.administration.classes.index.add": "Add class",
 	"pages.administration.classes.deleteDialog.title": "Delete class?",
-	"pages.administration.classes.deleteDialog.content": "\"Are you sure you want to delete class '<i>{itemName}<i>'?\"",
+	"pages.administration.classes.deleteDialog.content": "Are you sure you want to delete class \"<i>{itemName}<i>\"?",
+	"pages.administration.classes.manage": "Manage class",
+	"pages.administration.classes.edit": "Edit class",
+	"pages.administration.classes.delete": "Delete class",
+	"pages.administration.classes.createSuccessor": "Move class to the next school year",
 	"pages.content._id.addToTopic": "To be added to",
 	"pages.content._id.collection.selectElements": "Select the items you want to add to the topic",
 	"pages.content._id.metadata.author": "Author",
diff --git a/src/locales/es.json b/src/locales/es.json
index 2b3a5da97e..58ca1a55e5 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -732,7 +732,11 @@
 	"pages.administration.classes.index.title": "Administrar clases",
 	"pages.administration.classes.index.add": "Agregar clase",
 	"pages.administration.classes.deleteDialog.title": "¿Eliminar clase?",
-	"pages.administration.classes.deleteDialog.content": "\"¿Está seguro de que desea eliminar la clase '<i>{itemName}<i>'?\"",
+	"pages.administration.classes.deleteDialog.content": "¿Está seguro de que desea eliminar la clase \"<i>{itemName}<i>\"?",
+	"pages.administration.classes.manage": "Administrar clase",
+	"pages.administration.classes.edit": "Editar clase",
+	"pages.administration.classes.delete": "Eliminar clase",
+	"pages.administration.classes.createSuccessor": "Mover la clase al próximo año escolar",
 	"pages.content._id.addToTopic": "Para ser añadido a",
 	"pages.content._id.collection.selectElements": "Selecciona los elementos que deses añadir al tema",
 	"pages.content._id.metadata.author": "Autor",
diff --git a/src/locales/uk.json b/src/locales/uk.json
index f2948626ee..22b683750a 100644
--- a/src/locales/uk.json
+++ b/src/locales/uk.json
@@ -822,7 +822,11 @@
 	"pages.administration.classes.index.title": "Керувати заняттями",
 	"pages.administration.classes.index.add": "Додати клас",
 	"pages.administration.classes.deleteDialog.title": "Видалити клас?",
-	"pages.administration.classes.deleteDialog.content": "\"Ви впевнені, що хочете видалити клас \"<i>{itemName}<i>\"?\"",
+	"pages.administration.classes.deleteDialog.content": "Ви впевнені, що хочете видалити клас \"<i>{itemName}<i>\"?",
+	"pages.administration.classes.manage": "Керувати класом",
+	"pages.administration.classes.edit": "Редагувати клас",
+	"pages.administration.classes.delete": "Видалити клас",
+	"pages.administration.classes.createSuccessor": "Перенести клас на наступний навчальний рік",
 	"pages.content._id.addToTopic": "Для додавання в",
 	"pages.content._id.collection.selectElements": "Виберіть елементи, які треба додати до теми",
 	"pages.content._id.metadata.author": "Автор",
diff --git a/src/pages/administration/ClassOverview.page.unit.ts b/src/pages/administration/ClassOverview.page.unit.ts
index 78732bd874..ab5467ce54 100644
--- a/src/pages/administration/ClassOverview.page.unit.ts
+++ b/src/pages/administration/ClassOverview.page.unit.ts
@@ -8,9 +8,9 @@ import createComponentMocks from "@@/tests/test-utils/componentMocks";
 import Vue from "vue";
 import { SortOrder } from "@/store/types/sort-order.enum";
 import { Pagination } from "@/store/types/commons";
-import setupStores from "../../../tests/test-utils/setupStores";
-import AuthModule from "../../store/auth";
-import { authModule } from "../../store";
+import setupStores from "@@/tests/test-utils/setupStores";
+import AuthModule from "@/store/auth";
+import { authModule } from "@/store";
 
 const $router = {
 	push: jest.fn(),
@@ -427,7 +427,7 @@ describe("ClassOverview", () => {
 
 				const dialog = wrapper.find('[data-testid="delete-dialog"]');
 
-				expect(dialog.exists()).toBeTruthy();
+				expect(dialog.props("value")).toBeTruthy();
 			});
 		});
 
diff --git a/src/pages/administration/ClassOverview.page.vue b/src/pages/administration/ClassOverview.page.vue
index 283580f07c..7c7ef77fcc 100644
--- a/src/pages/administration/ClassOverview.page.vue
+++ b/src/pages/administration/ClassOverview.page.vue
@@ -23,39 +23,57 @@
 			@update:page="onUpdateCurrentPage"
 		>
 			<template v-slot:[`item.actions`]="{ item }">
-				<v-icon
-					v-if="hasPermission && !item.externalSourceName"
-					size="small"
-					data-testid="class-table-manage-icon"
-					@click="manageClass(item)"
-				>
-					{{ mdiAccountGroupOutline }}
-				</v-icon>
-				<v-icon
-					v-if="hasPermission && !item.externalSourceName"
-					size="small"
-					data-testid="class-table-edit-icon"
-					@click="editItem(item)"
-				>
-					{{ mdiPencilOutline }}
-				</v-icon>
-				<v-icon
-					v-if="hasPermission && !item.externalSourceName"
-					size="small"
-					data-testid="class-table-delete-icon"
-					@click="onOpenDeleteDialog(item)"
-				>
-					{{ mdiTrashCanOutline }}
-				</v-icon>
-				<v-icon
-					v-if="hasPermission && !item.externalSourceName"
-					:disabled="!item.isUpgradable"
-					size="small"
-					data-testid="class-table-successor-icon"
-					@click="createSuccessor(item)"
-				>
-					{{ mdiArrowUp }}
-				</v-icon>
+				<template v-if="showClassAction(item)">
+					<v-btn
+						:aria-label="$t('pages.administration.classes.manage')"
+						data-testid="class-table-manage-icon"
+						outlined
+						color="secondary"
+						small
+						:href="`/administration/classes/${item.id}/manage`"
+						class="mx-1 px-1"
+						min-width="0"
+					>
+						<v-icon>{{ mdiAccountGroupOutline }}</v-icon>
+					</v-btn>
+					<v-btn
+						:aria-label="$t('pages.administration.classes.edit')"
+						data-testid="class-table-edit-icon"
+						outlined
+						color="secondary"
+						small
+						:href="`/administration/classes/${item.id}/edit`"
+						class="mx-1 px-1"
+						min-width="0"
+					>
+						<v-icon>{{ mdiPencilOutline }}</v-icon>
+					</v-btn>
+					<v-btn
+						:aria-label="$t('pages.administration.classes.delete')"
+						data-testid="class-table-delete-icon"
+						outlined
+						color="secondary"
+						small
+						@click="onClickDeleteIcon(item)"
+						class="mx-1 px-1"
+						min-width="0"
+					>
+						<v-icon>{{ mdiTrashCanOutline }}</v-icon>
+					</v-btn>
+					<v-btn
+						:disabled="!item.isUpgradable"
+						:aria-label="$t('pages.administration.classes.createSuccessor')"
+						data-testid="class-table-successor-icon"
+						outlined
+						color="secondary"
+						small
+						:href="`/administration/classes/${item.id}/createSuccessor`"
+						class="mx-1 px-1"
+						min-width="0"
+					>
+						<v-icon>{{ mdiArrowUp }}</v-icon>
+					</v-btn>
+				</template>
 			</template>
 		</v-data-table>
 
@@ -82,12 +100,12 @@
 					/>
 				</v-card-text>
 				<v-card-actions>
-					<v-spacer></v-spacer>
+					<v-spacer />
 					<v-btn
 						data-testId="dialog-cancel"
 						depressed
 						text
-						@click="onCloseDeleteDialog"
+						@click="onCancelClassDeletion"
 					>
 						{{ t("common.actions.cancel") }}
 					</v-btn>
@@ -96,7 +114,7 @@
 						class="px-6"
 						color="primary"
 						depressed
-						@click="onDeleteClass"
+						@click="onConfirmClassDeletion"
 					>
 						{{ t("common.actions.confirm") }}
 					</v-btn>
@@ -130,18 +148,16 @@ import {
 import GroupModule from "@/store/group";
 import { useI18n } from "@/composables/i18n.composable";
 import { Pagination } from "@/store/types/commons";
-import { ClassInfo } from "@/store/types/class-info";
+import { ClassInfo, ClassRootType } from "@/store/types/class-info";
 import { GROUP_MODULE_KEY, injectStrict } from "@/utils/inject";
 import { SortOrder } from "@/store/types/sort-order.enum";
 import { authModule } from "@/store";
 import {
+	mdiAccountGroupOutline,
+	mdiArrowUp,
 	mdiPencilOutline,
 	mdiTrashCanOutline,
-	mdiArrowUp,
-	mdiAccountGroupOutline,
 } from "@mdi/js";
-import VueRouter from "vue-router";
-import { useRouter } from "vue-router/composables";
 
 export default defineComponent({
 	components: { DefaultWireframe, RenderHTML },
@@ -174,6 +190,9 @@ export default defineComponent({
 			authModule.getUserPermissions.includes("CLASS_EDIT".toLowerCase())
 		);
 
+		const showClassAction = (item: ClassInfo) =>
+			hasPermission.value && item.type === ClassRootType.Class;
+
 		const isDeleteDialogOpen: Ref<boolean> = ref(false);
 
 		const selectedItem: Ref<ClassInfo | undefined> = ref();
@@ -182,12 +201,12 @@ export default defineComponent({
 			() => selectedItem.value?.name || "???"
 		);
 
-		const onOpenDeleteDialog = (selectedClass: ClassInfo) => {
+		const onClickDeleteIcon = (selectedClass: ClassInfo) => {
 			selectedItem.value = selectedClass;
 			isDeleteDialogOpen.value = true;
 		};
 
-		const onCloseDeleteDialog = () => {
+		const onCancelClassDeletion = () => {
 			selectedItem.value = undefined;
 			isDeleteDialogOpen.value = false;
 		};
@@ -225,32 +244,12 @@ export default defineComponent({
 			},
 		];
 
-		const router: VueRouter = useRouter();
-
-		const manageClass = async (item: ClassInfo) => {
-			await router.push({
-				path: `/administration/classes/${item.id}/manage`,
-			});
-		};
-
-		const editItem = async (item: ClassInfo) => {
-			await router.push({
-				path: `/administration/classes/${item.id}/edit`,
-			});
-		};
-
-		const onDeleteClass = async () => {
+		const onConfirmClassDeletion = async () => {
 			if (selectedItem.value) {
 				await groupModule.deleteClass(selectedItem.value.id);
 			}
 
-			onCloseDeleteDialog();
-		};
-
-		const createSuccessor = async (item: ClassInfo) => {
-			await router.push({
-				path: `/administration/classes/${item.id}/createSuccessor`,
-			});
+			onCancelClassDeletion();
 		};
 
 		const onUpdateSortBy = async (sortBy: string) => {
@@ -286,6 +285,7 @@ export default defineComponent({
 			headers,
 			classes,
 			hasPermission,
+			showClassAction,
 			page,
 			sortBy,
 			sortOrder,
@@ -293,12 +293,9 @@ export default defineComponent({
 			selectedItem,
 			selectedItemName,
 			isDeleteDialogOpen,
-			onOpenDeleteDialog,
-			onCloseDeleteDialog,
-			onDeleteClass,
-			manageClass,
-			editItem,
-			createSuccessor,
+			onClickDeleteIcon,
+			onCancelClassDeletion,
+			onConfirmClassDeletion,
 			onUpdateSortBy,
 			updateSortOrder,
 			onUpdateCurrentPage,
diff --git a/src/store/group.unit.ts b/src/store/group.unit.ts
index 0fdb56760b..52fa52f824 100644
--- a/src/store/group.unit.ts
+++ b/src/store/group.unit.ts
@@ -17,7 +17,7 @@ import GroupModule from "./group";
 import { createMock, DeepMocked } from "@golevelup/ts-jest";
 import { mockApiResponse } from "@@/tests/test-utils/mockApiResponse";
 import { mapAxiosErrorToResponseError } from "@/utils/api";
-import { classInfoFactory } from "../../tests/test-utils/factory/classInfoFactory";
+import { classInfoFactory } from "@@/tests/test-utils/factory/classInfoFactory";
 import axios from "axios/index";
 
 describe("GroupModule", () => {
@@ -286,7 +286,6 @@ describe("GroupModule", () => {
 				await module.deleteClass(classId);
 
 				expect(module.loadClassesForSchool).toHaveBeenCalled();
-				expect(module.getClasses).toEqual([]);
 			});
 		});
 

From 3046fd7727645233e52bac8eb1ec29d5da2b8c2b Mon Sep 17 00:00:00 2001
From: Igor Richter <igor.richter@capgemini.com>
Date: Thu, 19 Oct 2023 16:00:40 +0200
Subject: [PATCH 08/14] request changes

---
 .../administration/ClassOverview.page.unit.ts | 59 +++++++------
 .../administration/ClassOverview.page.vue     | 84 ++++++++-----------
 src/store/group.ts                            |  7 +-
 tests/test-utils/factory/classInfoFactory.ts  |  2 +-
 4 files changed, 69 insertions(+), 83 deletions(-)

diff --git a/src/pages/administration/ClassOverview.page.unit.ts b/src/pages/administration/ClassOverview.page.unit.ts
index ab5467ce54..9ca4b9a466 100644
--- a/src/pages/administration/ClassOverview.page.unit.ts
+++ b/src/pages/administration/ClassOverview.page.unit.ts
@@ -11,10 +11,7 @@ import { Pagination } from "@/store/types/commons";
 import setupStores from "@@/tests/test-utils/setupStores";
 import AuthModule from "@/store/auth";
 import { authModule } from "@/store";
-
-const $router = {
-	push: jest.fn(),
-};
+import { ClassRootType } from "../../store/types/class-info";
 
 describe("ClassOverview", () => {
 	const getWrapper = (getters: Partial<GroupModule> = {}) => {
@@ -25,6 +22,7 @@ describe("ClassOverview", () => {
 				classInfoFactory.build(),
 				classInfoFactory.build({
 					externalSourceName: "",
+					type: ClassRootType.Class,
 					isUpgradable: true,
 				}),
 			],
@@ -44,7 +42,6 @@ describe("ClassOverview", () => {
 				[I18N_KEY.valueOf()]: i18nMock,
 				[GROUP_MODULE_KEY.valueOf()]: groupModule,
 			},
-			mocks: { $router },
 		});
 
 		return {
@@ -54,7 +51,6 @@ describe("ClassOverview", () => {
 	};
 
 	beforeEach(() => {
-		$router.push.mockReset();
 		setupStores({
 			authModule: AuthModule,
 		});
@@ -225,7 +221,7 @@ describe("ClassOverview", () => {
 	});
 
 	describe("action icons", () => {
-		describe("when classes are available", () => {
+		describe("when legacy classes are available", () => {
 			const setup = () => {
 				authModule.addUserPermmission("CLASS_EDIT");
 
@@ -314,13 +310,13 @@ describe("ClassOverview", () => {
 			it("should redirect to legacy class manage page", async () => {
 				const { wrapper, classId } = setup();
 
-				await wrapper
-					.find('[data-testid="class-table-manage-icon"]')
-					.trigger("click");
+				const manageBtn = wrapper.find(
+					'[data-testid="class-table-manage-btn"]'
+				);
 
-				expect($router.push).toHaveBeenCalledWith({
-					path: `/administration/classes/${classId}/manage`,
-				});
+				expect(manageBtn.attributes().href).toStrictEqual(
+					`/administration/classes/${classId}/manage`
+				);
 			});
 		});
 
@@ -341,13 +337,11 @@ describe("ClassOverview", () => {
 			it("should redirect to legacy class edit page", async () => {
 				const { wrapper, classId } = setup();
 
-				await wrapper
-					.find('[data-testid="class-table-edit-icon"]')
-					.trigger("click");
+				const editBtn = wrapper.find('[data-testid="class-table-edit-btn"]');
 
-				expect($router.push).toHaveBeenCalledWith({
-					path: `/administration/classes/${classId}/edit`,
-				});
+				expect(editBtn.attributes().href).toStrictEqual(
+					`/administration/classes/${classId}/edit`
+				);
 			});
 		});
 
@@ -369,13 +363,13 @@ describe("ClassOverview", () => {
 				it("should redirect to legacy class upgrade page", async () => {
 					const { wrapper, classId } = setup();
 
-					await wrapper
-						.find('[data-testid="class-table-successor-icon"]')
-						.trigger("click");
+					const successorBtn = wrapper.find(
+						'[data-testid="class-table-successor-btn"]'
+					);
 
-					expect($router.push).toHaveBeenCalledWith({
-						path: `/administration/classes/${classId}/createSuccessor`,
-					});
+					expect(successorBtn.attributes().href).toStrictEqual(
+						`/administration/classes/${classId}/createSuccessor`
+					);
 				});
 			});
 		});
@@ -388,6 +382,7 @@ describe("ClassOverview", () => {
 					getClasses: [
 						classInfoFactory.build({
 							externalSourceName: undefined,
+							type: ClassRootType.Class,
 							isUpgradable: false,
 						}),
 					],
@@ -398,12 +393,14 @@ describe("ClassOverview", () => {
 				};
 			};
 
-			it("should display the upgrade icon as disabled", () => {
+			it("should display the upgrade button as disabled", () => {
 				const { wrapper } = setup();
 
-				const icon = wrapper.find('[data-testid="class-table-successor-icon"]');
+				const successorBtn = wrapper.find(
+					'[data-testid="class-table-successor-btn"]'
+				);
 
-				expect(icon.attributes().disabled).toBe("disabled");
+				expect(successorBtn.attributes().disabled).toBe("disabled");
 			});
 		});
 
@@ -422,7 +419,7 @@ describe("ClassOverview", () => {
 				const { wrapper } = setup();
 
 				await wrapper
-					.find('[data-testid="class-table-delete-icon"]')
+					.find('[data-testid="class-table-delete-btn"]')
 					.trigger("click");
 
 				const dialog = wrapper.find('[data-testid="delete-dialog"]');
@@ -448,7 +445,7 @@ describe("ClassOverview", () => {
 					const { wrapper, groupModule } = setup();
 
 					await wrapper
-						.find('[data-testid="class-table-delete-icon"]')
+						.find('[data-testid="class-table-delete-btn"]')
 						.trigger("click");
 
 					const dialog = wrapper.find('[data-testid="delete-dialog"]');
@@ -464,7 +461,7 @@ describe("ClassOverview", () => {
 					const { wrapper, groupModule } = setup();
 
 					await wrapper
-						.find('[data-testid="class-table-delete-icon"]')
+						.find('[data-testid="class-table-delete-btn"]')
 						.trigger("click");
 
 					const dialog = wrapper.find('[data-testid="delete-dialog"]');
diff --git a/src/pages/administration/ClassOverview.page.vue b/src/pages/administration/ClassOverview.page.vue
index 7c7ef77fcc..b3209a5ddf 100644
--- a/src/pages/administration/ClassOverview.page.vue
+++ b/src/pages/administration/ClassOverview.page.vue
@@ -26,7 +26,7 @@
 				<template v-if="showClassAction(item)">
 					<v-btn
 						:aria-label="$t('pages.administration.classes.manage')"
-						data-testid="class-table-manage-icon"
+						data-testid="class-table-manage-btn"
 						outlined
 						color="secondary"
 						small
@@ -38,7 +38,7 @@
 					</v-btn>
 					<v-btn
 						:aria-label="$t('pages.administration.classes.edit')"
-						data-testid="class-table-edit-icon"
+						data-testid="class-table-edit-btn"
 						outlined
 						color="secondary"
 						small
@@ -50,7 +50,7 @@
 					</v-btn>
 					<v-btn
 						:aria-label="$t('pages.administration.classes.delete')"
-						data-testid="class-table-delete-icon"
+						data-testid="class-table-delete-btn"
 						outlined
 						color="secondary"
 						small
@@ -63,7 +63,7 @@
 					<v-btn
 						:disabled="!item.isUpgradable"
 						:aria-label="$t('pages.administration.classes.createSuccessor')"
-						data-testid="class-table-successor-icon"
+						data-testid="class-table-successor-btn"
 						outlined
 						color="secondary"
 						small
@@ -77,50 +77,30 @@
 			</template>
 		</v-data-table>
 
-		<v-dialog
+		<v-custom-dialog
 			v-model="isDeleteDialogOpen"
 			max-width="360"
 			data-testId="delete-dialog"
+			has-buttons
+			:buttons="['cancel', 'confirm']"
+			@dialog-canceled="onCancelClassDeletion"
+			@dialog-confirmed="onConfirmClassDeletion"
 		>
-			<v-card :ripple="false">
-				<v-card-title>
-					<h2 class="text-h4 my-2">
-						{{ t("pages.administration.classes.deleteDialog.title") }}
-					</h2>
-				</v-card-title>
-				<v-card-text class="text--primary">
-					<RenderHTML
-						class="text-md mt-2"
-						:html="
-							t('pages.administration.classes.deleteDialog.content', {
-								itemName: selectedItemName,
-							})
-						"
-						component="p"
-					/>
-				</v-card-text>
-				<v-card-actions>
-					<v-spacer />
-					<v-btn
-						data-testId="dialog-cancel"
-						depressed
-						text
-						@click="onCancelClassDeletion"
-					>
-						{{ t("common.actions.cancel") }}
-					</v-btn>
-					<v-btn
-						data-testId="dialog-confirm"
-						class="px-6"
-						color="primary"
-						depressed
-						@click="onConfirmClassDeletion"
-					>
-						{{ t("common.actions.confirm") }}
-					</v-btn>
-				</v-card-actions>
-			</v-card>
-		</v-dialog>
+			<h2 slot="title" class="text-h4 my-2">
+				{{ t("pages.administration.classes.deleteDialog.title") }}
+			</h2>
+			<template #content>
+				<RenderHTML
+					class="text-md mt-2"
+					:html="
+						t('pages.administration.classes.deleteDialog.content', {
+							itemName: selectedItemName,
+						})
+					"
+					component="p"
+				/>
+			</template>
+		</v-custom-dialog>
 
 		<v-btn
 			class="my-5 button-start"
@@ -149,20 +129,26 @@ import GroupModule from "@/store/group";
 import { useI18n } from "@/composables/i18n.composable";
 import { Pagination } from "@/store/types/commons";
 import { ClassInfo, ClassRootType } from "@/store/types/class-info";
-import { GROUP_MODULE_KEY, injectStrict } from "@/utils/inject";
+import {
+	AUTH_MODULE_KEY,
+	GROUP_MODULE_KEY,
+	injectStrict,
+} from "@/utils/inject";
 import { SortOrder } from "@/store/types/sort-order.enum";
-import { authModule } from "@/store";
 import {
 	mdiAccountGroupOutline,
 	mdiArrowUp,
 	mdiPencilOutline,
 	mdiTrashCanOutline,
 } from "@mdi/js";
+import AuthModule from "../../store/auth";
+import VCustomDialog from "../../components/organisms/vCustomDialog.vue";
 
 export default defineComponent({
-	components: { DefaultWireframe, RenderHTML },
+	components: { DefaultWireframe, RenderHTML, VCustomDialog },
 	setup() {
 		const groupModule: GroupModule = injectStrict(GROUP_MODULE_KEY);
+		const authModule: AuthModule = injectStrict(AUTH_MODULE_KEY);
 
 		const { t } = useI18n();
 
@@ -273,9 +259,7 @@ export default defineComponent({
 		};
 
 		onMounted(() => {
-			(async () => {
-				await groupModule.loadClassesForSchool();
-			})();
+			groupModule.loadClassesForSchool();
 		});
 
 		return {
diff --git a/src/store/group.ts b/src/store/group.ts
index 2ae36132b4..9f5701312d 100644
--- a/src/store/group.ts
+++ b/src/store/group.ts
@@ -108,8 +108,13 @@ export default class GroupModule extends VuexModule {
 	async deleteClass(classId: string): Promise<void> {
 		this.setLoading(true);
 		try {
+			const classes = this.getClasses;
 			await $axios.delete(`/v1/classes/${classId}`);
-			await this.loadClassesForSchool();
+
+			const filteredClasses = classes.filter(
+				(clazz: ClassInfo) => clazz.id !== classId
+			);
+			this.setClasses(filteredClasses);
 		} catch (error) {
 			const apiError = mapAxiosErrorToResponseError(error);
 
diff --git a/tests/test-utils/factory/classInfoFactory.ts b/tests/test-utils/factory/classInfoFactory.ts
index adbaf1b509..3d44a9797c 100644
--- a/tests/test-utils/factory/classInfoFactory.ts
+++ b/tests/test-utils/factory/classInfoFactory.ts
@@ -5,6 +5,6 @@ export const classInfoFactory = Factory.define<ClassInfo>(({ sequence }) => ({
 	name: `className${sequence}`,
 	externalSourceName: "Source",
 	teachers: ["TestTeacher"],
-	type: ClassRootType.Class,
+	type: ClassRootType.Group,
 	id: `id-${sequence}`,
 }));

From 8313be6a5942ad15cc51b9da1cfd1ac81af638cc Mon Sep 17 00:00:00 2001
From: Igor Richter <igor.richter@capgemini.com>
Date: Fri, 20 Oct 2023 09:19:20 +0200
Subject: [PATCH 09/14] request changes

---
 .../administration/ClassOverview.page.unit.ts | 43 +++++--------------
 .../administration/ClassOverview.page.vue     |  4 +-
 2 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/src/pages/administration/ClassOverview.page.unit.ts b/src/pages/administration/ClassOverview.page.unit.ts
index 9ca4b9a466..55baaf4292 100644
--- a/src/pages/administration/ClassOverview.page.unit.ts
+++ b/src/pages/administration/ClassOverview.page.unit.ts
@@ -3,15 +3,13 @@ import { createModuleMocks } from "@/utils/mock-store-module";
 import { classInfoFactory, i18nMock } from "@@/tests/test-utils";
 import { MountOptions, Wrapper, mount } from "@vue/test-utils";
 import ClassOverview from "./ClassOverview.page.vue";
-import { GROUP_MODULE_KEY, I18N_KEY } from "@/utils/inject";
+import { AUTH_MODULE_KEY, GROUP_MODULE_KEY, I18N_KEY } from "@/utils/inject";
 import createComponentMocks from "@@/tests/test-utils/componentMocks";
 import Vue from "vue";
 import { SortOrder } from "@/store/types/sort-order.enum";
 import { Pagination } from "@/store/types/commons";
-import setupStores from "@@/tests/test-utils/setupStores";
 import AuthModule from "@/store/auth";
-import { authModule } from "@/store";
-import { ClassRootType } from "../../store/types/class-info";
+import { ClassRootType } from "@/store/types/class-info";
 
 describe("ClassOverview", () => {
 	const getWrapper = (getters: Partial<GroupModule> = {}) => {
@@ -41,6 +39,7 @@ describe("ClassOverview", () => {
 			provide: {
 				[I18N_KEY.valueOf()]: i18nMock,
 				[GROUP_MODULE_KEY.valueOf()]: groupModule,
+				[AUTH_MODULE_KEY.valueOf()]: authModule,
 			},
 		});
 
@@ -50,12 +49,6 @@ describe("ClassOverview", () => {
 		};
 	};
 
-	beforeEach(() => {
-		setupStores({
-			authModule: AuthModule,
-		});
-	});
-
 	afterEach(() => {
 		jest.clearAllMocks();
 	});
@@ -223,8 +216,6 @@ describe("ClassOverview", () => {
 	describe("action icons", () => {
 		describe("when legacy classes are available", () => {
 			const setup = () => {
-				authModule.addUserPermmission("CLASS_EDIT");
-
 				const { wrapper } = getWrapper();
 
 				return {
@@ -235,18 +226,18 @@ describe("ClassOverview", () => {
 			it("should render 4 icons", () => {
 				const { wrapper } = setup();
 
-				const manageIcon = wrapper.find(
-					'[data-testid="class-table-manage-icon"]'
+				const manageBtn = wrapper.find(
+					'[data-testid="class-table-manage-btn"]'
 				);
 
-				const editIcon = wrapper.find('[data-testid="class-table-edit-icon"]');
+				const editBtn = wrapper.find('[data-testid="class-table-edit-btn"]');
 
-				const deleteIcon = wrapper.find(
-					'[data-testid="class-table-delete-icon"]'
+				const deleteBtn = wrapper.find(
+					'[data-testid="class-table-delete-btn"]'
 				);
 
-				const successorIcon = wrapper.find(
-					'[data-testid="class-table-successor-icon"]'
+				const successorBtn = wrapper.find(
+					'[data-testid="class-table-successor-btn"]'
 				);
 
 				expect(manageIcon.exists()).toBeTruthy();
@@ -258,8 +249,6 @@ describe("ClassOverview", () => {
 
 		describe("when no classes are available", () => {
 			const setup = () => {
-				authModule.addUserPermmission("CLASS_EDIT");
-
 				const { wrapper } = getWrapper({
 					getClasses: [classInfoFactory.build()],
 				});
@@ -295,8 +284,6 @@ describe("ClassOverview", () => {
 
 		describe("when clicking on the manage class icon", () => {
 			const setup = () => {
-				authModule.addUserPermmission("CLASS_EDIT");
-
 				const { wrapper, groupModule } = getWrapper();
 
 				const classId: string = groupModule.getClasses[1].id;
@@ -322,8 +309,6 @@ describe("ClassOverview", () => {
 
 		describe("when clicking on the edit class icon", () => {
 			const setup = () => {
-				authModule.addUserPermmission("CLASS_EDIT");
-
 				const { wrapper, groupModule } = getWrapper();
 
 				const classId: string = groupModule.getClasses[1].id;
@@ -348,8 +333,6 @@ describe("ClassOverview", () => {
 		describe("when class is upgradable", () => {
 			describe("when clicking on the upgrade class icon", () => {
 				const setup = () => {
-					authModule.addUserPermmission("CLASS_EDIT");
-
 					const { wrapper, groupModule } = getWrapper();
 
 					const classId: string = groupModule.getClasses[1].id;
@@ -376,8 +359,6 @@ describe("ClassOverview", () => {
 
 		describe("when class is not upgradable", () => {
 			const setup = () => {
-				authModule.addUserPermmission("CLASS_EDIT");
-
 				const { wrapper } = getWrapper({
 					getClasses: [
 						classInfoFactory.build({
@@ -406,8 +387,6 @@ describe("ClassOverview", () => {
 
 		describe("when clicking on the delete class icon", () => {
 			const setup = () => {
-				authModule.addUserPermmission("CLASS_EDIT");
-
 				const { wrapper } = getWrapper();
 
 				return {
@@ -430,8 +409,6 @@ describe("ClassOverview", () => {
 
 		describe("when delete dialog is open", () => {
 			const setup = () => {
-				authModule.addUserPermmission("CLASS_EDIT");
-
 				const { wrapper, groupModule } = getWrapper();
 
 				return {
diff --git a/src/pages/administration/ClassOverview.page.vue b/src/pages/administration/ClassOverview.page.vue
index b3209a5ddf..59b298965f 100644
--- a/src/pages/administration/ClassOverview.page.vue
+++ b/src/pages/administration/ClassOverview.page.vue
@@ -83,7 +83,7 @@
 			data-testId="delete-dialog"
 			has-buttons
 			:buttons="['cancel', 'confirm']"
-			@dialog-canceled="onCancelClassDeletion"
+			@dialog-closed="onCancelClassDeletion"
 			@dialog-confirmed="onConfirmClassDeletion"
 		>
 			<h2 slot="title" class="text-h4 my-2">
@@ -234,8 +234,6 @@ export default defineComponent({
 			if (selectedItem.value) {
 				await groupModule.deleteClass(selectedItem.value.id);
 			}
-
-			onCancelClassDeletion();
 		};
 
 		const onUpdateSortBy = async (sortBy: string) => {

From d3aa21d22d3771574fe7c3ffd8445b89de81aa27 Mon Sep 17 00:00:00 2001
From: Igor Richter <igor.richter@capgemini.com>
Date: Fri, 20 Oct 2023 09:21:41 +0200
Subject: [PATCH 10/14] Changes by mohlerki

---
 .../administration/ClassOverview.page.unit.ts | 48 ++++++++++---------
 src/store/group.ts                            | 13 +++--
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/pages/administration/ClassOverview.page.unit.ts b/src/pages/administration/ClassOverview.page.unit.ts
index 55baaf4292..38d9c0b5fa 100644
--- a/src/pages/administration/ClassOverview.page.unit.ts
+++ b/src/pages/administration/ClassOverview.page.unit.ts
@@ -32,6 +32,10 @@ describe("ClassOverview", () => {
 			...getters,
 		});
 
+		const authModule = createModuleMocks(AuthModule, {
+			getUserPermissions: ["CLASS_EDIT".toLowerCase()],
+		});
+
 		const wrapper: Wrapper<Vue> = mount(ClassOverview as MountOptions<Vue>, {
 			...createComponentMocks({
 				i18n: true,
@@ -213,7 +217,7 @@ describe("ClassOverview", () => {
 		});
 	});
 
-	describe("action icons", () => {
+	describe("action buttons", () => {
 		describe("when legacy classes are available", () => {
 			const setup = () => {
 				const { wrapper } = getWrapper();
@@ -223,7 +227,7 @@ describe("ClassOverview", () => {
 				};
 			};
 
-			it("should render 4 icons", () => {
+			it("should render 4 buttons", () => {
 				const { wrapper } = setup();
 
 				const manageBtn = wrapper.find(
@@ -240,10 +244,10 @@ describe("ClassOverview", () => {
 					'[data-testid="class-table-successor-btn"]'
 				);
 
-				expect(manageIcon.exists()).toBeTruthy();
-				expect(editIcon.exists()).toBeTruthy();
-				expect(deleteIcon.exists()).toBeTruthy();
-				expect(successorIcon.exists()).toBeTruthy();
+				expect(manageBtn.exists()).toBeTruthy();
+				expect(editBtn.exists()).toBeTruthy();
+				expect(deleteBtn.exists()).toBeTruthy();
+				expect(successorBtn.exists()).toBeTruthy();
 			});
 		});
 
@@ -258,31 +262,31 @@ describe("ClassOverview", () => {
 				};
 			};
 
-			it("should not render any icons", () => {
+			it("should not render any buttons", () => {
 				const { wrapper } = setup();
 
-				const manageIcon = wrapper.find(
-					'[data-testid="class-table-manage-icon"]'
+				const manageBtn = wrapper.find(
+					'[data-testid="class-table-manage-btn"]'
 				);
 
-				const editIcon = wrapper.find('[data-testid="class-table-edit-icon"]');
+				const editBtn = wrapper.find('[data-testid="class-table-edit-btn"]');
 
-				const deleteIcon = wrapper.find(
-					'[data-testid="class-table-delete-icon"]'
+				const deleteBtn = wrapper.find(
+					'[data-testid="class-table-delete-btn"]'
 				);
 
-				const successorIcon = wrapper.find(
-					'[data-testid="class-table-successor-icon"]'
+				const successorBtn = wrapper.find(
+					'[data-testid="class-table-successor-btn"]'
 				);
 
-				expect(manageIcon.exists()).toBeFalsy();
-				expect(editIcon.exists()).toBeFalsy();
-				expect(deleteIcon.exists()).toBeFalsy();
-				expect(successorIcon.exists()).toBeFalsy();
+				expect(manageBtn.exists()).toBeFalsy();
+				expect(editBtn.exists()).toBeFalsy();
+				expect(deleteBtn.exists()).toBeFalsy();
+				expect(successorBtn.exists()).toBeFalsy();
 			});
 		});
 
-		describe("when clicking on the manage class icon", () => {
+		describe("when clicking on the manage class button", () => {
 			const setup = () => {
 				const { wrapper, groupModule } = getWrapper();
 
@@ -307,7 +311,7 @@ describe("ClassOverview", () => {
 			});
 		});
 
-		describe("when clicking on the edit class icon", () => {
+		describe("when clicking on the edit class button", () => {
 			const setup = () => {
 				const { wrapper, groupModule } = getWrapper();
 
@@ -331,7 +335,7 @@ describe("ClassOverview", () => {
 		});
 
 		describe("when class is upgradable", () => {
-			describe("when clicking on the upgrade class icon", () => {
+			describe("when clicking on the upgrade class button", () => {
 				const setup = () => {
 					const { wrapper, groupModule } = getWrapper();
 
@@ -385,7 +389,7 @@ describe("ClassOverview", () => {
 			});
 		});
 
-		describe("when clicking on the delete class icon", () => {
+		describe("when clicking on the delete class button", () => {
 			const setup = () => {
 				const { wrapper } = getWrapper();
 
diff --git a/src/store/group.ts b/src/store/group.ts
index 9f5701312d..09b9892d90 100644
--- a/src/store/group.ts
+++ b/src/store/group.ts
@@ -104,17 +104,20 @@ export default class GroupModule extends VuexModule {
 		this.page = page;
 	}
 
+	@Mutation
+	removeClass(classId: string) {
+		this.classes = this.classes.filter(
+			(clazz: ClassInfo) => clazz.id !== classId
+		);
+	}
+
 	@Action
 	async deleteClass(classId: string): Promise<void> {
 		this.setLoading(true);
 		try {
-			const classes = this.getClasses;
 			await $axios.delete(`/v1/classes/${classId}`);
 
-			const filteredClasses = classes.filter(
-				(clazz: ClassInfo) => clazz.id !== classId
-			);
-			this.setClasses(filteredClasses);
+			this.removeClass(classId);
 		} catch (error) {
 			const apiError = mapAxiosErrorToResponseError(error);
 

From b998d8d55872ec18914917e7cf30d3925f0c04a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20=C3=96hlerking?= <marvin.oehlerking@capgemini.com>
Date: Fri, 20 Oct 2023 09:50:21 +0200
Subject: [PATCH 11/14] finish tests

---
 .../administration/ClassOverview.page.unit.ts | 63 ++++++++++++++----
 .../administration/ClassOverview.page.vue     | 34 +++++-----
 src/store/group.ts                            |  4 +-
 src/store/group.unit.ts                       | 65 ++++++++++++-------
 4 files changed, 109 insertions(+), 57 deletions(-)

diff --git a/src/pages/administration/ClassOverview.page.unit.ts b/src/pages/administration/ClassOverview.page.unit.ts
index 38d9c0b5fa..8a050f02ab 100644
--- a/src/pages/administration/ClassOverview.page.unit.ts
+++ b/src/pages/administration/ClassOverview.page.unit.ts
@@ -1,15 +1,15 @@
+import AuthModule from "@/store/auth";
 import GroupModule from "@/store/group";
+import { ClassInfo, ClassRootType } from "@/store/types/class-info";
+import { Pagination } from "@/store/types/commons";
+import { SortOrder } from "@/store/types/sort-order.enum";
+import { AUTH_MODULE_KEY, GROUP_MODULE_KEY, I18N_KEY } from "@/utils/inject";
 import { createModuleMocks } from "@/utils/mock-store-module";
 import { classInfoFactory, i18nMock } from "@@/tests/test-utils";
-import { MountOptions, Wrapper, mount } from "@vue/test-utils";
-import ClassOverview from "./ClassOverview.page.vue";
-import { AUTH_MODULE_KEY, GROUP_MODULE_KEY, I18N_KEY } from "@/utils/inject";
 import createComponentMocks from "@@/tests/test-utils/componentMocks";
+import { mount, MountOptions, Wrapper } from "@vue/test-utils";
 import Vue from "vue";
-import { SortOrder } from "@/store/types/sort-order.enum";
-import { Pagination } from "@/store/types/commons";
-import AuthModule from "@/store/auth";
-import { ClassRootType } from "@/store/types/class-info";
+import ClassOverview from "./ClassOverview.page.vue";
 
 describe("ClassOverview", () => {
 	const getWrapper = (getters: Partial<GroupModule> = {}) => {
@@ -19,7 +19,7 @@ describe("ClassOverview", () => {
 			getClasses: [
 				classInfoFactory.build(),
 				classInfoFactory.build({
-					externalSourceName: "",
+					externalSourceName: undefined,
 					type: ClassRootType.Class,
 					isUpgradable: true,
 				}),
@@ -84,6 +84,37 @@ describe("ClassOverview", () => {
 		});
 	});
 
+	describe("when there are classes or groups to display", () => {
+		const setup = () => {
+			const classes: ClassInfo[] = [
+				classInfoFactory.build(),
+				classInfoFactory.build({
+					externalSourceName: undefined,
+					type: ClassRootType.Class,
+					isUpgradable: true,
+				}),
+			];
+
+			const { wrapper, groupModule } = getWrapper({
+				getClasses: classes,
+			});
+
+			return {
+				classes,
+				wrapper,
+				groupModule,
+			};
+		};
+
+		it("should display the entries in the table", async () => {
+			const { classes, wrapper } = setup();
+
+			const table = wrapper.find('[data-testid="admin-class-table"]');
+
+			expect(table.props("items")).toEqual(classes);
+		});
+	});
+
 	describe("onUpdateSortBy", () => {
 		describe("when changing the sortBy", () => {
 			const setup = () => {
@@ -101,9 +132,10 @@ describe("ClassOverview", () => {
 			it("should call store to change sort by", async () => {
 				const { sortBy, wrapper, groupModule } = setup();
 
-				await wrapper
+				wrapper
 					.find('[data-testid="admin-class-table"]')
 					.vm.$emit("update:sort-by", sortBy);
+				await Vue.nextTick();
 
 				expect(groupModule.loadClassesForSchool).toHaveBeenCalled();
 				expect(groupModule.setSortBy).toHaveBeenCalledWith(sortBy);
@@ -128,9 +160,10 @@ describe("ClassOverview", () => {
 			it("should call store to change sort order", async () => {
 				const { sortOrder, wrapper, groupModule } = setup();
 
-				await wrapper
+				wrapper
 					.find('[data-testid="admin-class-table"]')
 					.vm.$emit("update:sort-desc", sortOrder);
+				await Vue.nextTick();
 
 				expect(groupModule.loadClassesForSchool).toHaveBeenCalled();
 				expect(groupModule.setSortOrder).toHaveBeenCalledWith(SortOrder.DESC);
@@ -168,9 +201,10 @@ describe("ClassOverview", () => {
 			it("should call store to change the limit in pagination", async () => {
 				const { itemsPerPage, wrapper, groupModule, pagination } = setup();
 
-				await wrapper
+				wrapper
 					.find('[data-testid="admin-class-table"]')
 					.vm.$emit("update:items-per-page", itemsPerPage);
+				await Vue.nextTick();
 
 				expect(groupModule.loadClassesForSchool).toHaveBeenCalled();
 				expect(groupModule.setPagination).toHaveBeenCalledWith({
@@ -206,9 +240,10 @@ describe("ClassOverview", () => {
 			it("should call store to update current page", async () => {
 				const { page, wrapper, groupModule, pagination } = setup();
 
-				await wrapper
+				wrapper
 					.find('[data-testid="admin-class-table"]')
 					.vm.$emit("update:page", page);
+				await Vue.nextTick();
 
 				expect(groupModule.loadClassesForSchool).toHaveBeenCalled();
 				expect(groupModule.setPage).toHaveBeenCalledWith(page);
@@ -385,7 +420,7 @@ describe("ClassOverview", () => {
 					'[data-testid="class-table-successor-btn"]'
 				);
 
-				expect(successorBtn.attributes().disabled).toBe("disabled");
+				expect(successorBtn.props("disabled")).toEqual(true);
 			});
 		});
 
@@ -407,7 +442,7 @@ describe("ClassOverview", () => {
 
 				const dialog = wrapper.find('[data-testid="delete-dialog"]');
 
-				expect(dialog.props("value")).toBeTruthy();
+				expect(dialog.props("isOpen")).toBeTruthy();
 			});
 		});
 
diff --git a/src/pages/administration/ClassOverview.page.vue b/src/pages/administration/ClassOverview.page.vue
index 59b298965f..e88a1c52e9 100644
--- a/src/pages/administration/ClassOverview.page.vue
+++ b/src/pages/administration/ClassOverview.page.vue
@@ -25,7 +25,7 @@
 			<template v-slot:[`item.actions`]="{ item }">
 				<template v-if="showClassAction(item)">
 					<v-btn
-						:aria-label="$t('pages.administration.classes.manage')"
+						:aria-label="t('pages.administration.classes.manage')"
 						data-testid="class-table-manage-btn"
 						outlined
 						color="secondary"
@@ -37,7 +37,7 @@
 						<v-icon>{{ mdiAccountGroupOutline }}</v-icon>
 					</v-btn>
 					<v-btn
-						:aria-label="$t('pages.administration.classes.edit')"
+						:aria-label="t('pages.administration.classes.edit')"
 						data-testid="class-table-edit-btn"
 						outlined
 						color="secondary"
@@ -62,7 +62,7 @@
 					</v-btn>
 					<v-btn
 						:disabled="!item.isUpgradable"
-						:aria-label="$t('pages.administration.classes.createSuccessor')"
+						:aria-label="t('pages.administration.classes.createSuccessor')"
 						data-testid="class-table-successor-btn"
 						outlined
 						color="secondary"
@@ -78,7 +78,7 @@
 		</v-data-table>
 
 		<v-custom-dialog
-			v-model="isDeleteDialogOpen"
+			:is-open="isDeleteDialogOpen"
 			max-width="360"
 			data-testId="delete-dialog"
 			has-buttons
@@ -114,35 +114,35 @@
 </template>
 
 <script lang="ts">
-import { RenderHTML } from "@feature-render-html";
 import { Breadcrumb } from "@/components/templates/default-wireframe.types";
 import DefaultWireframe from "@/components/templates/DefaultWireframe.vue";
-import {
-	computed,
-	ComputedRef,
-	defineComponent,
-	onMounted,
-	ref,
-	Ref,
-} from "vue";
-import GroupModule from "@/store/group";
 import { useI18n } from "@/composables/i18n.composable";
-import { Pagination } from "@/store/types/commons";
+import GroupModule from "@/store/group";
 import { ClassInfo, ClassRootType } from "@/store/types/class-info";
+import { Pagination } from "@/store/types/commons";
+import { SortOrder } from "@/store/types/sort-order.enum";
 import {
 	AUTH_MODULE_KEY,
 	GROUP_MODULE_KEY,
 	injectStrict,
 } from "@/utils/inject";
-import { SortOrder } from "@/store/types/sort-order.enum";
+import { RenderHTML } from "@feature-render-html";
 import {
 	mdiAccountGroupOutline,
 	mdiArrowUp,
 	mdiPencilOutline,
 	mdiTrashCanOutline,
 } from "@mdi/js";
-import AuthModule from "../../store/auth";
+import {
+	computed,
+	ComputedRef,
+	defineComponent,
+	onMounted,
+	ref,
+	Ref,
+} from "vue";
 import VCustomDialog from "../../components/organisms/vCustomDialog.vue";
+import AuthModule from "../../store/auth";
 
 export default defineComponent({
 	components: { DefaultWireframe, RenderHTML, VCustomDialog },
diff --git a/src/store/group.ts b/src/store/group.ts
index 09b9892d90..a5bc23f5a2 100644
--- a/src/store/group.ts
+++ b/src/store/group.ts
@@ -6,10 +6,10 @@ import {
 import { $axios, mapAxiosErrorToResponseError } from "@/utils/api";
 import { AxiosResponse } from "axios";
 import { Action, Module, Mutation, VuexModule } from "vuex-module-decorators";
+import { GroupMapper } from "./group/group.mapper";
 import { ClassInfo } from "./types/class-info";
 import { BusinessError, Pagination } from "./types/commons";
 import { SortOrder } from "./types/sort-order.enum";
-import { GroupMapper } from "./group/group.mapper";
 
 @Module({
 	name: "groupModule",
@@ -114,6 +114,7 @@ export default class GroupModule extends VuexModule {
 	@Action
 	async deleteClass(classId: string): Promise<void> {
 		this.setLoading(true);
+
 		try {
 			await $axios.delete(`/v1/classes/${classId}`);
 
@@ -129,6 +130,7 @@ export default class GroupModule extends VuexModule {
 				message: `${apiError.type}: ${apiError.message}`,
 			});
 		}
+
 		this.setLoading(false);
 	}
 
diff --git a/src/store/group.unit.ts b/src/store/group.unit.ts
index 52fa52f824..17e66c9310 100644
--- a/src/store/group.unit.ts
+++ b/src/store/group.unit.ts
@@ -1,35 +1,38 @@
-import * as serverApi from "@/serverApi/v3/api";
 import {
 	ClassInfoResponse,
 	ClassInfoSearchListResponse,
 	GroupApiInterface,
 } from "@/serverApi/v3";
+import * as serverApi from "@/serverApi/v3/api";
+import { initializeAxios, mapAxiosErrorToResponseError } from "@/utils/api";
 import {
 	axiosErrorFactory,
 	businessErrorFactory,
 	classInfoResponseFactory,
 	classInfoSearchListResponseFactory,
 } from "@@/tests/test-utils";
+import { classInfoFactory } from "@@/tests/test-utils/factory/classInfoFactory";
+import { mockApiResponse } from "@@/tests/test-utils/mockApiResponse";
+import { createMock, DeepMocked } from "@golevelup/ts-jest";
+import { AxiosInstance } from "axios";
+import GroupModule from "./group";
 import { ClassInfo, ClassRootType } from "./types/class-info";
 import { BusinessError, Pagination } from "./types/commons";
 import { SortOrder } from "./types/sort-order.enum";
-import GroupModule from "./group";
-import { createMock, DeepMocked } from "@golevelup/ts-jest";
-import { mockApiResponse } from "@@/tests/test-utils/mockApiResponse";
-import { mapAxiosErrorToResponseError } from "@/utils/api";
-import { classInfoFactory } from "@@/tests/test-utils/factory/classInfoFactory";
-import axios from "axios/index";
 
 describe("GroupModule", () => {
 	let module: GroupModule;
 
 	let apiMock: DeepMocked<GroupApiInterface>;
+	let axiosMock: DeepMocked<AxiosInstance>;
 
 	beforeEach(() => {
 		module = new GroupModule({});
 
 		apiMock = createMock<GroupApiInterface>();
+		axiosMock = createMock<AxiosInstance>();
 
+		initializeAxios(axiosMock);
 		jest.spyOn(serverApi, "GroupApiFactory").mockReturnValue(apiMock);
 	});
 
@@ -260,54 +263,58 @@ describe("GroupModule", () => {
 		});
 	});
 
-	// TODO test deleteClass method by mocking the v1 axios call
 	describe("deleteClass", () => {
 		describe("when called", () => {
 			const setup = () => {
-				const clazz: ClassInfo = classInfoFactory.build();
-				const classId = clazz.id;
+				const class1: ClassInfo = classInfoFactory.build();
+				const class2: ClassInfo = classInfoFactory.build();
+
+				module.setClasses([class1, class2]);
 
 				return {
-					classId,
+					class1,
+					class2,
 				};
 			};
 
 			it("should delete the class", async () => {
-				const { classId } = setup();
+				const { class1 } = setup();
 
-				await module.deleteClass(classId);
+				await module.deleteClass(class1.id);
 
-				expect(axios.delete).toHaveBeenCalled();
+				expect(axiosMock.delete).toHaveBeenCalled();
 			});
 
-			it("should load classes", async () => {
-				const { classId } = setup();
+			it("should remove the class from the store", async () => {
+				const { class1, class2 } = setup();
 
-				await module.deleteClass(classId);
+				await module.deleteClass(class1.id);
 
-				expect(module.loadClassesForSchool).toHaveBeenCalled();
+				expect(module.getClasses).toEqual([class2]);
 			});
 		});
 
-		describe("when error is returned", () => {
+		describe("when an error occurs during the api call", () => {
 			const setup = () => {
 				const error = axiosErrorFactory.build();
 				const apiError = mapAxiosErrorToResponseError(error);
-				const clazz: ClassInfo = classInfoFactory.build();
-				const classId = clazz.id;
+				const class1: ClassInfo = classInfoFactory.build();
+				const class2: ClassInfo = classInfoFactory.build();
 
-				module.loadClassesForSchool.mockRejectedValue(error);
+				module.setClasses([class1, class2]);
+				axiosMock.delete.mockRejectedValue(error);
 
 				return {
 					apiError,
-					classId,
+					class1,
+					class2,
 				};
 			};
 
 			it("should update the stores error", async () => {
-				const { apiError, classId } = setup();
+				const { apiError, class1 } = setup();
 
-				await module.deleteClass(classId);
+				await module.deleteClass(class1.id);
 
 				expect(module.getBusinessError).toEqual<BusinessError>({
 					error: apiError,
@@ -315,6 +322,14 @@ describe("GroupModule", () => {
 					message: `${apiError.type}: ${apiError.message}`,
 				});
 			});
+
+			it("should not remove the class from the store", async () => {
+				const { class1, class2 } = setup();
+
+				await module.deleteClass(class1.id);
+
+				expect(module.getClasses).toEqual([class1, class2]);
+			});
 		});
 	});
 });

From bfd00cbfcfad926f6d5f5874b24135efee3b57b8 Mon Sep 17 00:00:00 2001
From: Arne Gnisa <arne.gnisa@capgemini.com>
Date: Fri, 20 Oct 2023 13:41:12 +0200
Subject: [PATCH 12/14] N21-1264 reloads page on deletion

---
 src/store/group.ts      |  9 +--------
 src/store/group.unit.ts | 10 ++++------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/store/group.ts b/src/store/group.ts
index a5bc23f5a2..d27dc28750 100644
--- a/src/store/group.ts
+++ b/src/store/group.ts
@@ -104,13 +104,6 @@ export default class GroupModule extends VuexModule {
 		this.page = page;
 	}
 
-	@Mutation
-	removeClass(classId: string) {
-		this.classes = this.classes.filter(
-			(clazz: ClassInfo) => clazz.id !== classId
-		);
-	}
-
 	@Action
 	async deleteClass(classId: string): Promise<void> {
 		this.setLoading(true);
@@ -118,7 +111,7 @@ export default class GroupModule extends VuexModule {
 		try {
 			await $axios.delete(`/v1/classes/${classId}`);
 
-			this.removeClass(classId);
+			await this.loadClassesForSchool();
 		} catch (error) {
 			const apiError = mapAxiosErrorToResponseError(error);
 
diff --git a/src/store/group.unit.ts b/src/store/group.unit.ts
index 17e66c9310..3c92c477b0 100644
--- a/src/store/group.unit.ts
+++ b/src/store/group.unit.ts
@@ -267,13 +267,11 @@ describe("GroupModule", () => {
 		describe("when called", () => {
 			const setup = () => {
 				const class1: ClassInfo = classInfoFactory.build();
-				const class2: ClassInfo = classInfoFactory.build();
 
-				module.setClasses([class1, class2]);
+				module.setClasses([class1]);
 
 				return {
 					class1,
-					class2,
 				};
 			};
 
@@ -285,12 +283,12 @@ describe("GroupModule", () => {
 				expect(axiosMock.delete).toHaveBeenCalled();
 			});
 
-			it("should remove the class from the store", async () => {
-				const { class1, class2 } = setup();
+			it("should load classes for school", async () => {
+				const { class1 } = setup();
 
 				await module.deleteClass(class1.id);
 
-				expect(module.getClasses).toEqual([class2]);
+				expect(apiMock.groupControllerFindClassesForSchool).toHaveBeenCalled();
 			});
 		});
 

From 0eba1b1f7d17051ed011119af8935d881f79c1c1 Mon Sep 17 00:00:00 2001
From: Igor Richter <igor.richter@capgemini.com>
Date: Fri, 20 Oct 2023 15:02:14 +0200
Subject: [PATCH 13/14] generate api

---
 src/serverApi/v3/api.ts | 302 ++++++++++++++--------------------------
 1 file changed, 105 insertions(+), 197 deletions(-)

diff --git a/src/serverApi/v3/api.ts b/src/serverApi/v3/api.ts
index eb8e7b7ab0..80bcf6a50b 100644
--- a/src/serverApi/v3/api.ts
+++ b/src/serverApi/v3/api.ts
@@ -818,8 +818,7 @@ export interface ContextExternalToolResponse {
     * @enum {string}
     */
 export enum ContextExternalToolResponseContextTypeEnum {
-    Course = 'course',
-    BoardElement = 'board-element'
+    Course = 'course'
 }
 
 /**
@@ -1542,7 +1541,7 @@ export interface ExternalToolElementContent {
      * @type {string}
      * @memberof ExternalToolElementContent
      */
-    contextExternalToolId: string | null;
+    contextExternalToolId?: string;
 }
 /**
  * 
@@ -4104,7 +4103,7 @@ export interface SubmissionContainerContentBody {
      * @type {string}
      * @memberof SubmissionContainerContentBody
      */
-    dueDate?: string | null;
+    dueDate?: string;
 }
 /**
  * 
@@ -4547,27 +4546,6 @@ export interface TimestampsResponse {
      */
     deletedAt?: string;
 }
-/**
- * 
- * @export
- * @enum {string}
- */
-export enum ToolConfigurationStatusResponse {
-    Latest = 'Latest',
-    Outdated = 'Outdated',
-    Unknown = 'Unknown'
-}
-
-/**
- * 
- * @export
- * @enum {string}
- */
-export enum ToolContextType {
-    Course = 'course',
-    BoardElement = 'board-element'
-}
-
 /**
  * 
  * @export
@@ -4653,12 +4631,23 @@ export interface ToolReferenceResponse {
      */
     openInNewTab: boolean;
     /**
-     * 
-     * @type {ToolConfigurationStatusResponse}
+     * The status of the tool
+     * @type {string}
      * @memberof ToolReferenceResponse
      */
-    status: ToolConfigurationStatusResponse;
+    status: ToolReferenceResponseStatusEnum;
+}
+
+/**
+    * @export
+    * @enum {string}
+    */
+export enum ToolReferenceResponseStatusEnum {
+    Latest = 'Latest',
+    Outdated = 'Outdated',
+    Unknown = 'Unknown'
 }
+
 /**
  * 
  * @export
@@ -13595,11 +13584,11 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
          * 
          * @summary Returns a list of ContextExternalTools for the given context
          * @param {string} contextId 
-         * @param {ToolContextType} contextType 
+         * @param {string} contextType 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        toolContextControllerGetContextExternalToolsForContext: async (contextId: string, contextType: ToolContextType, options: any = {}): Promise<RequestArgs> => {
+        toolContextControllerGetContextExternalToolsForContext: async (contextId: string, contextType: string, options: any = {}): Promise<RequestArgs> => {
             // verify required parameter 'contextId' is not null or undefined
             assertParamExists('toolContextControllerGetContextExternalToolsForContext', 'contextId', contextId)
             // verify required parameter 'contextType' is not null or undefined
@@ -13897,19 +13886,20 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
         },
         /**
          * 
-         * @summary Updates an ExternalTool
-         * @param {string} externalToolId 
-         * @param {ExternalToolUpdateParams} externalToolUpdateParams 
+         * @summary Get ExternalTool References for a given context
+         * @param {string} contextId 
+         * @param {string} contextType 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        toolControllerUpdateExternalTool: async (externalToolId: string, externalToolUpdateParams: ExternalToolUpdateParams, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'externalToolId' is not null or undefined
-            assertParamExists('toolControllerUpdateExternalTool', 'externalToolId', externalToolId)
-            // verify required parameter 'externalToolUpdateParams' is not null or undefined
-            assertParamExists('toolControllerUpdateExternalTool', 'externalToolUpdateParams', externalToolUpdateParams)
-            const localVarPath = `/tools/external-tools/{externalToolId}`
-                .replace(`{${"externalToolId"}}`, encodeURIComponent(String(externalToolId)));
+        toolControllerGetToolReferences: async (contextId: string, contextType: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'contextId' is not null or undefined
+            assertParamExists('toolControllerGetToolReferences', 'contextId', contextId)
+            // verify required parameter 'contextType' is not null or undefined
+            assertParamExists('toolControllerGetToolReferences', 'contextType', contextType)
+            const localVarPath = `/tools/external-tools/{contextType}/{contextId}/references`
+                .replace(`{${"contextId"}}`, encodeURIComponent(String(contextId)))
+                .replace(`{${"contextType"}}`, encodeURIComponent(String(contextType)));
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
             let baseOptions;
@@ -13917,7 +13907,7 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
                 baseOptions = configuration.baseOptions;
             }
 
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -13927,12 +13917,9 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(externalToolUpdateParams, localVarRequestOptions, configuration)
 
             return {
                 url: toPathString(localVarUrlObj),
@@ -13941,16 +13928,19 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
         },
         /**
          * 
-         * @summary Get tool launch request for a context external tool id
-         * @param {string} contextExternalToolId The id of the context external tool
+         * @summary Updates an ExternalTool
+         * @param {string} externalToolId 
+         * @param {ExternalToolUpdateParams} externalToolUpdateParams 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        toolLaunchControllerGetToolLaunchRequest: async (contextExternalToolId: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'contextExternalToolId' is not null or undefined
-            assertParamExists('toolLaunchControllerGetToolLaunchRequest', 'contextExternalToolId', contextExternalToolId)
-            const localVarPath = `/tools/context/{contextExternalToolId}/launch`
-                .replace(`{${"contextExternalToolId"}}`, encodeURIComponent(String(contextExternalToolId)));
+        toolControllerUpdateExternalTool: async (externalToolId: string, externalToolUpdateParams: ExternalToolUpdateParams, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'externalToolId' is not null or undefined
+            assertParamExists('toolControllerUpdateExternalTool', 'externalToolId', externalToolId)
+            // verify required parameter 'externalToolUpdateParams' is not null or undefined
+            assertParamExists('toolControllerUpdateExternalTool', 'externalToolUpdateParams', externalToolUpdateParams)
+            const localVarPath = `/tools/external-tools/{externalToolId}`
+                .replace(`{${"externalToolId"}}`, encodeURIComponent(String(externalToolId)));
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
             let baseOptions;
@@ -13958,7 +13948,7 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
                 baseOptions = configuration.baseOptions;
             }
 
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -13968,9 +13958,12 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(externalToolUpdateParams, localVarRequestOptions, configuration)
 
             return {
                 url: toPathString(localVarUrlObj),
@@ -13979,15 +13972,15 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
         },
         /**
          * 
-         * @summary Get ExternalTool Reference for a given context external tool
-         * @param {string} contextExternalToolId 
+         * @summary Get tool launch request for a context external tool id
+         * @param {string} contextExternalToolId The id of the context external tool
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        toolReferenceControllerGetToolReference: async (contextExternalToolId: string, options: any = {}): Promise<RequestArgs> => {
+        toolLaunchControllerGetToolLaunchRequest: async (contextExternalToolId: string, options: any = {}): Promise<RequestArgs> => {
             // verify required parameter 'contextExternalToolId' is not null or undefined
-            assertParamExists('toolReferenceControllerGetToolReference', 'contextExternalToolId', contextExternalToolId)
-            const localVarPath = `/tools/tool-references/context-external-tools/{contextExternalToolId}`
+            assertParamExists('toolLaunchControllerGetToolLaunchRequest', 'contextExternalToolId', contextExternalToolId)
+            const localVarPath = `/tools/context/{contextExternalToolId}/launch`
                 .replace(`{${"contextExternalToolId"}}`, encodeURIComponent(String(contextExternalToolId)));
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -14006,48 +13999,6 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
-            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @summary Get ExternalTool References for a given context
-         * @param {string} contextId 
-         * @param {ToolContextType} contextType 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        toolReferenceControllerGetToolReferencesForContext: async (contextId: string, contextType: ToolContextType, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'contextId' is not null or undefined
-            assertParamExists('toolReferenceControllerGetToolReferencesForContext', 'contextId', contextId)
-            // verify required parameter 'contextType' is not null or undefined
-            assertParamExists('toolReferenceControllerGetToolReferencesForContext', 'contextType', contextType)
-            const localVarPath = `/tools/tool-references/{contextType}/{contextId}`
-                .replace(`{${"contextId"}}`, encodeURIComponent(String(contextId)))
-                .replace(`{${"contextType"}}`, encodeURIComponent(String(contextType)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication bearer required
-            // http bearer authentication required
-            await setBearerAuthToObject(localVarHeaderParameter, configuration)
-
-
-    
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -14350,11 +14301,11 @@ export const ToolApiFp = function(configuration?: Configuration) {
          * 
          * @summary Returns a list of ContextExternalTools for the given context
          * @param {string} contextId 
-         * @param {ToolContextType} contextType 
+         * @param {string} contextType 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async toolContextControllerGetContextExternalToolsForContext(contextId: string, contextType: ToolContextType, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ContextExternalToolSearchListResponse>> {
+        async toolContextControllerGetContextExternalToolsForContext(contextId: string, contextType: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ContextExternalToolSearchListResponse>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.toolContextControllerGetContextExternalToolsForContext(contextId, contextType, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
@@ -14430,6 +14381,18 @@ export const ToolApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.toolControllerGetExternalToolLogo(externalToolId, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @summary Get ExternalTool References for a given context
+         * @param {string} contextId 
+         * @param {string} contextType 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async toolControllerGetToolReferences(contextId: string, contextType: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ToolReferenceListResponse>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.toolControllerGetToolReferences(contextId, contextType, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @summary Updates an ExternalTool
@@ -14453,29 +14416,6 @@ export const ToolApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.toolLaunchControllerGetToolLaunchRequest(contextExternalToolId, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
-        /**
-         * 
-         * @summary Get ExternalTool Reference for a given context external tool
-         * @param {string} contextExternalToolId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async toolReferenceControllerGetToolReference(contextExternalToolId: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ToolReferenceResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.toolReferenceControllerGetToolReference(contextExternalToolId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
-        /**
-         * 
-         * @summary Get ExternalTool References for a given context
-         * @param {string} contextId 
-         * @param {ToolContextType} contextType 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async toolReferenceControllerGetToolReferencesForContext(contextId: string, contextType: ToolContextType, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ToolReferenceListResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.toolReferenceControllerGetToolReferencesForContext(contextId, contextType, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
         /**
          * 
          * @summary Creates a SchoolExternalTool
@@ -14617,11 +14557,11 @@ export const ToolApiFactory = function (configuration?: Configuration, basePath?
          * 
          * @summary Returns a list of ContextExternalTools for the given context
          * @param {string} contextId 
-         * @param {ToolContextType} contextType 
+         * @param {string} contextType 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        toolContextControllerGetContextExternalToolsForContext(contextId: string, contextType: ToolContextType, options?: any): AxiosPromise<ContextExternalToolSearchListResponse> {
+        toolContextControllerGetContextExternalToolsForContext(contextId: string, contextType: string, options?: any): AxiosPromise<ContextExternalToolSearchListResponse> {
             return localVarFp.toolContextControllerGetContextExternalToolsForContext(contextId, contextType, options).then((request) => request(axios, basePath));
         },
         /**
@@ -14690,6 +14630,17 @@ export const ToolApiFactory = function (configuration?: Configuration, basePath?
         toolControllerGetExternalToolLogo(externalToolId: string, options?: any): AxiosPromise<void> {
             return localVarFp.toolControllerGetExternalToolLogo(externalToolId, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary Get ExternalTool References for a given context
+         * @param {string} contextId 
+         * @param {string} contextType 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        toolControllerGetToolReferences(contextId: string, contextType: string, options?: any): AxiosPromise<ToolReferenceListResponse> {
+            return localVarFp.toolControllerGetToolReferences(contextId, contextType, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary Updates an ExternalTool
@@ -14711,27 +14662,6 @@ export const ToolApiFactory = function (configuration?: Configuration, basePath?
         toolLaunchControllerGetToolLaunchRequest(contextExternalToolId: string, options?: any): AxiosPromise<ToolLaunchRequestResponse> {
             return localVarFp.toolLaunchControllerGetToolLaunchRequest(contextExternalToolId, options).then((request) => request(axios, basePath));
         },
-        /**
-         * 
-         * @summary Get ExternalTool Reference for a given context external tool
-         * @param {string} contextExternalToolId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        toolReferenceControllerGetToolReference(contextExternalToolId: string, options?: any): AxiosPromise<ToolReferenceResponse> {
-            return localVarFp.toolReferenceControllerGetToolReference(contextExternalToolId, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * 
-         * @summary Get ExternalTool References for a given context
-         * @param {string} contextId 
-         * @param {ToolContextType} contextType 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        toolReferenceControllerGetToolReferencesForContext(contextId: string, contextType: ToolContextType, options?: any): AxiosPromise<ToolReferenceListResponse> {
-            return localVarFp.toolReferenceControllerGetToolReferencesForContext(contextId, contextType, options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @summary Creates a SchoolExternalTool
@@ -14867,12 +14797,12 @@ export interface ToolApiInterface {
      * 
      * @summary Returns a list of ContextExternalTools for the given context
      * @param {string} contextId 
-     * @param {ToolContextType} contextType 
+     * @param {string} contextType 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof ToolApiInterface
      */
-    toolContextControllerGetContextExternalToolsForContext(contextId: string, contextType: ToolContextType, options?: any): AxiosPromise<ContextExternalToolSearchListResponse>;
+    toolContextControllerGetContextExternalToolsForContext(contextId: string, contextType: string, options?: any): AxiosPromise<ContextExternalToolSearchListResponse>;
 
     /**
      * 
@@ -14942,45 +14872,35 @@ export interface ToolApiInterface {
 
     /**
      * 
-     * @summary Updates an ExternalTool
-     * @param {string} externalToolId 
-     * @param {ExternalToolUpdateParams} externalToolUpdateParams 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ToolApiInterface
-     */
-    toolControllerUpdateExternalTool(externalToolId: string, externalToolUpdateParams: ExternalToolUpdateParams, options?: any): AxiosPromise<ExternalToolResponse>;
-
-    /**
-     * 
-     * @summary Get tool launch request for a context external tool id
-     * @param {string} contextExternalToolId The id of the context external tool
+     * @summary Get ExternalTool References for a given context
+     * @param {string} contextId 
+     * @param {string} contextType 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof ToolApiInterface
      */
-    toolLaunchControllerGetToolLaunchRequest(contextExternalToolId: string, options?: any): AxiosPromise<ToolLaunchRequestResponse>;
+    toolControllerGetToolReferences(contextId: string, contextType: string, options?: any): AxiosPromise<ToolReferenceListResponse>;
 
     /**
      * 
-     * @summary Get ExternalTool Reference for a given context external tool
-     * @param {string} contextExternalToolId 
+     * @summary Updates an ExternalTool
+     * @param {string} externalToolId 
+     * @param {ExternalToolUpdateParams} externalToolUpdateParams 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof ToolApiInterface
      */
-    toolReferenceControllerGetToolReference(contextExternalToolId: string, options?: any): AxiosPromise<ToolReferenceResponse>;
+    toolControllerUpdateExternalTool(externalToolId: string, externalToolUpdateParams: ExternalToolUpdateParams, options?: any): AxiosPromise<ExternalToolResponse>;
 
     /**
      * 
-     * @summary Get ExternalTool References for a given context
-     * @param {string} contextId 
-     * @param {ToolContextType} contextType 
+     * @summary Get tool launch request for a context external tool id
+     * @param {string} contextExternalToolId The id of the context external tool
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof ToolApiInterface
      */
-    toolReferenceControllerGetToolReferencesForContext(contextId: string, contextType: ToolContextType, options?: any): AxiosPromise<ToolReferenceListResponse>;
+    toolLaunchControllerGetToolLaunchRequest(contextExternalToolId: string, options?: any): AxiosPromise<ToolLaunchRequestResponse>;
 
     /**
      * 
@@ -15131,12 +15051,12 @@ export class ToolApi extends BaseAPI implements ToolApiInterface {
      * 
      * @summary Returns a list of ContextExternalTools for the given context
      * @param {string} contextId 
-     * @param {ToolContextType} contextType 
+     * @param {string} contextType 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof ToolApi
      */
-    public toolContextControllerGetContextExternalToolsForContext(contextId: string, contextType: ToolContextType, options?: any) {
+    public toolContextControllerGetContextExternalToolsForContext(contextId: string, contextType: string, options?: any) {
         return ToolApiFp(this.configuration).toolContextControllerGetContextExternalToolsForContext(contextId, contextType, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -15218,6 +15138,19 @@ export class ToolApi extends BaseAPI implements ToolApiInterface {
         return ToolApiFp(this.configuration).toolControllerGetExternalToolLogo(externalToolId, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @summary Get ExternalTool References for a given context
+     * @param {string} contextId 
+     * @param {string} contextType 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ToolApi
+     */
+    public toolControllerGetToolReferences(contextId: string, contextType: string, options?: any) {
+        return ToolApiFp(this.configuration).toolControllerGetToolReferences(contextId, contextType, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @summary Updates an ExternalTool
@@ -15243,31 +15176,6 @@ export class ToolApi extends BaseAPI implements ToolApiInterface {
         return ToolApiFp(this.configuration).toolLaunchControllerGetToolLaunchRequest(contextExternalToolId, options).then((request) => request(this.axios, this.basePath));
     }
 
-    /**
-     * 
-     * @summary Get ExternalTool Reference for a given context external tool
-     * @param {string} contextExternalToolId 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ToolApi
-     */
-    public toolReferenceControllerGetToolReference(contextExternalToolId: string, options?: any) {
-        return ToolApiFp(this.configuration).toolReferenceControllerGetToolReference(contextExternalToolId, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * 
-     * @summary Get ExternalTool References for a given context
-     * @param {string} contextId 
-     * @param {ToolContextType} contextType 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ToolApi
-     */
-    public toolReferenceControllerGetToolReferencesForContext(contextId: string, contextType: ToolContextType, options?: any) {
-        return ToolApiFp(this.configuration).toolReferenceControllerGetToolReferencesForContext(contextId, contextType, options).then((request) => request(this.axios, this.basePath));
-    }
-
     /**
      * 
      * @summary Creates a SchoolExternalTool

From d2626c2927eb201e273139eb6e288bf6d2c435d5 Mon Sep 17 00:00:00 2001
From: Arne Gnisa <arne.gnisa@capgemini.com>
Date: Fri, 20 Oct 2023 15:12:48 +0200
Subject: [PATCH 14/14] N21-1264 regenerate api

---
 src/serverApi/v3/api.ts | 300 ++++++++++++++++++++++++++--------------
 1 file changed, 196 insertions(+), 104 deletions(-)

diff --git a/src/serverApi/v3/api.ts b/src/serverApi/v3/api.ts
index 80bcf6a50b..7b1fdfee28 100644
--- a/src/serverApi/v3/api.ts
+++ b/src/serverApi/v3/api.ts
@@ -818,7 +818,8 @@ export interface ContextExternalToolResponse {
     * @enum {string}
     */
 export enum ContextExternalToolResponseContextTypeEnum {
-    Course = 'course'
+    Course = 'course',
+    BoardElement = 'board-element'
 }
 
 /**
@@ -1541,7 +1542,7 @@ export interface ExternalToolElementContent {
      * @type {string}
      * @memberof ExternalToolElementContent
      */
-    contextExternalToolId?: string;
+    contextExternalToolId: string | null;
 }
 /**
  * 
@@ -4546,6 +4547,27 @@ export interface TimestampsResponse {
      */
     deletedAt?: string;
 }
+/**
+ * 
+ * @export
+ * @enum {string}
+ */
+export enum ToolConfigurationStatusResponse {
+    Latest = 'Latest',
+    Outdated = 'Outdated',
+    Unknown = 'Unknown'
+}
+
+/**
+ * 
+ * @export
+ * @enum {string}
+ */
+export enum ToolContextType {
+    Course = 'course',
+    BoardElement = 'board-element'
+}
+
 /**
  * 
  * @export
@@ -4631,23 +4653,12 @@ export interface ToolReferenceResponse {
      */
     openInNewTab: boolean;
     /**
-     * The status of the tool
-     * @type {string}
+     * 
+     * @type {ToolConfigurationStatusResponse}
      * @memberof ToolReferenceResponse
      */
-    status: ToolReferenceResponseStatusEnum;
-}
-
-/**
-    * @export
-    * @enum {string}
-    */
-export enum ToolReferenceResponseStatusEnum {
-    Latest = 'Latest',
-    Outdated = 'Outdated',
-    Unknown = 'Unknown'
+    status: ToolConfigurationStatusResponse;
 }
-
 /**
  * 
  * @export
@@ -13584,11 +13595,11 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
          * 
          * @summary Returns a list of ContextExternalTools for the given context
          * @param {string} contextId 
-         * @param {string} contextType 
+         * @param {ToolContextType} contextType 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        toolContextControllerGetContextExternalToolsForContext: async (contextId: string, contextType: string, options: any = {}): Promise<RequestArgs> => {
+        toolContextControllerGetContextExternalToolsForContext: async (contextId: string, contextType: ToolContextType, options: any = {}): Promise<RequestArgs> => {
             // verify required parameter 'contextId' is not null or undefined
             assertParamExists('toolContextControllerGetContextExternalToolsForContext', 'contextId', contextId)
             // verify required parameter 'contextType' is not null or undefined
@@ -13886,20 +13897,19 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
         },
         /**
          * 
-         * @summary Get ExternalTool References for a given context
-         * @param {string} contextId 
-         * @param {string} contextType 
+         * @summary Updates an ExternalTool
+         * @param {string} externalToolId 
+         * @param {ExternalToolUpdateParams} externalToolUpdateParams 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        toolControllerGetToolReferences: async (contextId: string, contextType: string, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'contextId' is not null or undefined
-            assertParamExists('toolControllerGetToolReferences', 'contextId', contextId)
-            // verify required parameter 'contextType' is not null or undefined
-            assertParamExists('toolControllerGetToolReferences', 'contextType', contextType)
-            const localVarPath = `/tools/external-tools/{contextType}/{contextId}/references`
-                .replace(`{${"contextId"}}`, encodeURIComponent(String(contextId)))
-                .replace(`{${"contextType"}}`, encodeURIComponent(String(contextType)));
+        toolControllerUpdateExternalTool: async (externalToolId: string, externalToolUpdateParams: ExternalToolUpdateParams, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'externalToolId' is not null or undefined
+            assertParamExists('toolControllerUpdateExternalTool', 'externalToolId', externalToolId)
+            // verify required parameter 'externalToolUpdateParams' is not null or undefined
+            assertParamExists('toolControllerUpdateExternalTool', 'externalToolUpdateParams', externalToolUpdateParams)
+            const localVarPath = `/tools/external-tools/{externalToolId}`
+                .replace(`{${"externalToolId"}}`, encodeURIComponent(String(externalToolId)));
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
             let baseOptions;
@@ -13907,7 +13917,7 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
                 baseOptions = configuration.baseOptions;
             }
 
-            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -13917,9 +13927,12 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(externalToolUpdateParams, localVarRequestOptions, configuration)
 
             return {
                 url: toPathString(localVarUrlObj),
@@ -13928,19 +13941,16 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
         },
         /**
          * 
-         * @summary Updates an ExternalTool
-         * @param {string} externalToolId 
-         * @param {ExternalToolUpdateParams} externalToolUpdateParams 
+         * @summary Get tool launch request for a context external tool id
+         * @param {string} contextExternalToolId The id of the context external tool
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        toolControllerUpdateExternalTool: async (externalToolId: string, externalToolUpdateParams: ExternalToolUpdateParams, options: any = {}): Promise<RequestArgs> => {
-            // verify required parameter 'externalToolId' is not null or undefined
-            assertParamExists('toolControllerUpdateExternalTool', 'externalToolId', externalToolId)
-            // verify required parameter 'externalToolUpdateParams' is not null or undefined
-            assertParamExists('toolControllerUpdateExternalTool', 'externalToolUpdateParams', externalToolUpdateParams)
-            const localVarPath = `/tools/external-tools/{externalToolId}`
-                .replace(`{${"externalToolId"}}`, encodeURIComponent(String(externalToolId)));
+        toolLaunchControllerGetToolLaunchRequest: async (contextExternalToolId: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'contextExternalToolId' is not null or undefined
+            assertParamExists('toolLaunchControllerGetToolLaunchRequest', 'contextExternalToolId', contextExternalToolId)
+            const localVarPath = `/tools/context/{contextExternalToolId}/launch`
+                .replace(`{${"contextExternalToolId"}}`, encodeURIComponent(String(contextExternalToolId)));
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
             let baseOptions;
@@ -13948,7 +13958,7 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
                 baseOptions = configuration.baseOptions;
             }
 
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
@@ -13958,12 +13968,9 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(externalToolUpdateParams, localVarRequestOptions, configuration)
 
             return {
                 url: toPathString(localVarUrlObj),
@@ -13972,15 +13979,15 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
         },
         /**
          * 
-         * @summary Get tool launch request for a context external tool id
-         * @param {string} contextExternalToolId The id of the context external tool
+         * @summary Get ExternalTool Reference for a given context external tool
+         * @param {string} contextExternalToolId 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        toolLaunchControllerGetToolLaunchRequest: async (contextExternalToolId: string, options: any = {}): Promise<RequestArgs> => {
+        toolReferenceControllerGetToolReference: async (contextExternalToolId: string, options: any = {}): Promise<RequestArgs> => {
             // verify required parameter 'contextExternalToolId' is not null or undefined
-            assertParamExists('toolLaunchControllerGetToolLaunchRequest', 'contextExternalToolId', contextExternalToolId)
-            const localVarPath = `/tools/context/{contextExternalToolId}/launch`
+            assertParamExists('toolReferenceControllerGetToolReference', 'contextExternalToolId', contextExternalToolId)
+            const localVarPath = `/tools/tool-references/context-external-tools/{contextExternalToolId}`
                 .replace(`{${"contextExternalToolId"}}`, encodeURIComponent(String(contextExternalToolId)));
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -13999,6 +14006,48 @@ export const ToolApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary Get ExternalTool References for a given context
+         * @param {string} contextId 
+         * @param {ToolContextType} contextType 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        toolReferenceControllerGetToolReferencesForContext: async (contextId: string, contextType: ToolContextType, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'contextId' is not null or undefined
+            assertParamExists('toolReferenceControllerGetToolReferencesForContext', 'contextId', contextId)
+            // verify required parameter 'contextType' is not null or undefined
+            assertParamExists('toolReferenceControllerGetToolReferencesForContext', 'contextType', contextType)
+            const localVarPath = `/tools/tool-references/{contextType}/{contextId}`
+                .replace(`{${"contextId"}}`, encodeURIComponent(String(contextId)))
+                .replace(`{${"contextType"}}`, encodeURIComponent(String(contextType)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication bearer required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration)
+
+
+    
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -14301,11 +14350,11 @@ export const ToolApiFp = function(configuration?: Configuration) {
          * 
          * @summary Returns a list of ContextExternalTools for the given context
          * @param {string} contextId 
-         * @param {string} contextType 
+         * @param {ToolContextType} contextType 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async toolContextControllerGetContextExternalToolsForContext(contextId: string, contextType: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ContextExternalToolSearchListResponse>> {
+        async toolContextControllerGetContextExternalToolsForContext(contextId: string, contextType: ToolContextType, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ContextExternalToolSearchListResponse>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.toolContextControllerGetContextExternalToolsForContext(contextId, contextType, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
@@ -14381,18 +14430,6 @@ export const ToolApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.toolControllerGetExternalToolLogo(externalToolId, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
-        /**
-         * 
-         * @summary Get ExternalTool References for a given context
-         * @param {string} contextId 
-         * @param {string} contextType 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async toolControllerGetToolReferences(contextId: string, contextType: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ToolReferenceListResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.toolControllerGetToolReferences(contextId, contextType, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
-        },
         /**
          * 
          * @summary Updates an ExternalTool
@@ -14416,6 +14453,29 @@ export const ToolApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.toolLaunchControllerGetToolLaunchRequest(contextExternalToolId, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @summary Get ExternalTool Reference for a given context external tool
+         * @param {string} contextExternalToolId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async toolReferenceControllerGetToolReference(contextExternalToolId: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ToolReferenceResponse>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.toolReferenceControllerGetToolReference(contextExternalToolId, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * 
+         * @summary Get ExternalTool References for a given context
+         * @param {string} contextId 
+         * @param {ToolContextType} contextType 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async toolReferenceControllerGetToolReferencesForContext(contextId: string, contextType: ToolContextType, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ToolReferenceListResponse>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.toolReferenceControllerGetToolReferencesForContext(contextId, contextType, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @summary Creates a SchoolExternalTool
@@ -14557,11 +14617,11 @@ export const ToolApiFactory = function (configuration?: Configuration, basePath?
          * 
          * @summary Returns a list of ContextExternalTools for the given context
          * @param {string} contextId 
-         * @param {string} contextType 
+         * @param {ToolContextType} contextType 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        toolContextControllerGetContextExternalToolsForContext(contextId: string, contextType: string, options?: any): AxiosPromise<ContextExternalToolSearchListResponse> {
+        toolContextControllerGetContextExternalToolsForContext(contextId: string, contextType: ToolContextType, options?: any): AxiosPromise<ContextExternalToolSearchListResponse> {
             return localVarFp.toolContextControllerGetContextExternalToolsForContext(contextId, contextType, options).then((request) => request(axios, basePath));
         },
         /**
@@ -14630,17 +14690,6 @@ export const ToolApiFactory = function (configuration?: Configuration, basePath?
         toolControllerGetExternalToolLogo(externalToolId: string, options?: any): AxiosPromise<void> {
             return localVarFp.toolControllerGetExternalToolLogo(externalToolId, options).then((request) => request(axios, basePath));
         },
-        /**
-         * 
-         * @summary Get ExternalTool References for a given context
-         * @param {string} contextId 
-         * @param {string} contextType 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        toolControllerGetToolReferences(contextId: string, contextType: string, options?: any): AxiosPromise<ToolReferenceListResponse> {
-            return localVarFp.toolControllerGetToolReferences(contextId, contextType, options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @summary Updates an ExternalTool
@@ -14662,6 +14711,27 @@ export const ToolApiFactory = function (configuration?: Configuration, basePath?
         toolLaunchControllerGetToolLaunchRequest(contextExternalToolId: string, options?: any): AxiosPromise<ToolLaunchRequestResponse> {
             return localVarFp.toolLaunchControllerGetToolLaunchRequest(contextExternalToolId, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary Get ExternalTool Reference for a given context external tool
+         * @param {string} contextExternalToolId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        toolReferenceControllerGetToolReference(contextExternalToolId: string, options?: any): AxiosPromise<ToolReferenceResponse> {
+            return localVarFp.toolReferenceControllerGetToolReference(contextExternalToolId, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary Get ExternalTool References for a given context
+         * @param {string} contextId 
+         * @param {ToolContextType} contextType 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        toolReferenceControllerGetToolReferencesForContext(contextId: string, contextType: ToolContextType, options?: any): AxiosPromise<ToolReferenceListResponse> {
+            return localVarFp.toolReferenceControllerGetToolReferencesForContext(contextId, contextType, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary Creates a SchoolExternalTool
@@ -14797,12 +14867,12 @@ export interface ToolApiInterface {
      * 
      * @summary Returns a list of ContextExternalTools for the given context
      * @param {string} contextId 
-     * @param {string} contextType 
+     * @param {ToolContextType} contextType 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof ToolApiInterface
      */
-    toolContextControllerGetContextExternalToolsForContext(contextId: string, contextType: string, options?: any): AxiosPromise<ContextExternalToolSearchListResponse>;
+    toolContextControllerGetContextExternalToolsForContext(contextId: string, contextType: ToolContextType, options?: any): AxiosPromise<ContextExternalToolSearchListResponse>;
 
     /**
      * 
@@ -14870,17 +14940,6 @@ export interface ToolApiInterface {
      */
     toolControllerGetExternalToolLogo(externalToolId: string, options?: any): AxiosPromise<void>;
 
-    /**
-     * 
-     * @summary Get ExternalTool References for a given context
-     * @param {string} contextId 
-     * @param {string} contextType 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ToolApiInterface
-     */
-    toolControllerGetToolReferences(contextId: string, contextType: string, options?: any): AxiosPromise<ToolReferenceListResponse>;
-
     /**
      * 
      * @summary Updates an ExternalTool
@@ -14902,6 +14961,27 @@ export interface ToolApiInterface {
      */
     toolLaunchControllerGetToolLaunchRequest(contextExternalToolId: string, options?: any): AxiosPromise<ToolLaunchRequestResponse>;
 
+    /**
+     * 
+     * @summary Get ExternalTool Reference for a given context external tool
+     * @param {string} contextExternalToolId 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ToolApiInterface
+     */
+    toolReferenceControllerGetToolReference(contextExternalToolId: string, options?: any): AxiosPromise<ToolReferenceResponse>;
+
+    /**
+     * 
+     * @summary Get ExternalTool References for a given context
+     * @param {string} contextId 
+     * @param {ToolContextType} contextType 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ToolApiInterface
+     */
+    toolReferenceControllerGetToolReferencesForContext(contextId: string, contextType: ToolContextType, options?: any): AxiosPromise<ToolReferenceListResponse>;
+
     /**
      * 
      * @summary Creates a SchoolExternalTool
@@ -15051,12 +15131,12 @@ export class ToolApi extends BaseAPI implements ToolApiInterface {
      * 
      * @summary Returns a list of ContextExternalTools for the given context
      * @param {string} contextId 
-     * @param {string} contextType 
+     * @param {ToolContextType} contextType 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof ToolApi
      */
-    public toolContextControllerGetContextExternalToolsForContext(contextId: string, contextType: string, options?: any) {
+    public toolContextControllerGetContextExternalToolsForContext(contextId: string, contextType: ToolContextType, options?: any) {
         return ToolApiFp(this.configuration).toolContextControllerGetContextExternalToolsForContext(contextId, contextType, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -15138,19 +15218,6 @@ export class ToolApi extends BaseAPI implements ToolApiInterface {
         return ToolApiFp(this.configuration).toolControllerGetExternalToolLogo(externalToolId, options).then((request) => request(this.axios, this.basePath));
     }
 
-    /**
-     * 
-     * @summary Get ExternalTool References for a given context
-     * @param {string} contextId 
-     * @param {string} contextType 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ToolApi
-     */
-    public toolControllerGetToolReferences(contextId: string, contextType: string, options?: any) {
-        return ToolApiFp(this.configuration).toolControllerGetToolReferences(contextId, contextType, options).then((request) => request(this.axios, this.basePath));
-    }
-
     /**
      * 
      * @summary Updates an ExternalTool
@@ -15176,6 +15243,31 @@ export class ToolApi extends BaseAPI implements ToolApiInterface {
         return ToolApiFp(this.configuration).toolLaunchControllerGetToolLaunchRequest(contextExternalToolId, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @summary Get ExternalTool Reference for a given context external tool
+     * @param {string} contextExternalToolId 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ToolApi
+     */
+    public toolReferenceControllerGetToolReference(contextExternalToolId: string, options?: any) {
+        return ToolApiFp(this.configuration).toolReferenceControllerGetToolReference(contextExternalToolId, options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @summary Get ExternalTool References for a given context
+     * @param {string} contextId 
+     * @param {ToolContextType} contextType 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ToolApi
+     */
+    public toolReferenceControllerGetToolReferencesForContext(contextId: string, contextType: ToolContextType, options?: any) {
+        return ToolApiFp(this.configuration).toolReferenceControllerGetToolReferencesForContext(contextId, contextType, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @summary Creates a SchoolExternalTool