Merge branch 'BC-6871-board-refactor' of https://github.com/hpi-schul…

…-cloud/schulcloud-server into BC-6871-board-refactor
hpi-schul-cloud · Jun 13, 2024 · 63382b7 · 63382b7
2 parents cc87929 + 79cf2db
commit 63382b7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/ansible/roles/schulcloud-server-core/templates/admin-api-server-configmap.yml.j2 b/ansible/roles/schulcloud-server-core/templates/admin-api-server-configmap.yml.j2
@@ -13,3 +13,4 @@ data:
   FEATURE_PROMETHEUS_METRICS_ENABLED: "true"
   CALENDAR_URI: "{{ CALENDAR_URI }}"
   ROCKET_CHAT_URI: "{{ ROCKET_CHAT_URI }}"
+  ETHERPAD__PAD_URI: "https://{{ DOMAIN }}/etherpad/p"
diff --git a/...ble/roles/schulcloud-server-core/templates/data-deletion-trigger-cronjob-configmap.yml.j2 b/...ble/roles/schulcloud-server-core/templates/data-deletion-trigger-cronjob-configmap.yml.j2
@@ -11,3 +11,5 @@ data:
   EXIT_ON_ERROR: "true"
   SC_DOMAIN: "{{ DOMAIN }}"
   FEATURE_PROMETHEUS_METRICS_ENABLED: "true"
+  ETHERPAD__PAD_URI: "https://{{ DOMAIN }}/etherpad/p"
+
diff --git a/apps/server/src/modules/board/service/internal/board-node-delete-hooks.service.ts b/apps/server/src/modules/board/service/internal/board-node-delete-hooks.service.ts
@@ -49,6 +49,8 @@ export class BoardNodeDeleteHooksService {
 			await this.afterDeleteCollaborativeTextEditorElement(boardNode);
 		} else if (isMediaExternalToolElement(boardNode)) {
 			await this.afterDeleteMediaExternalToolElement(boardNode);
+		} else {
+			// noop
 		}
 		await Promise.allSettled(boardNode.children.map(async (child) => this.afterDelete(child)));
 	}