From 122da5152a3f1295286eb8cf0f4b4daf5c03464a Mon Sep 17 00:00:00 2001 From: Max Bischof <106820326+bischofmax@users.noreply.github.com> Date: Thu, 13 Jun 2024 16:54:47 +0200 Subject: [PATCH 1/2] BC-7467 - Add PAD_URI to admin api server and delete config map (#5065) --- .../templates/admin-api-server-configmap.yml.j2 | 1 + .../templates/data-deletion-trigger-cronjob-configmap.yml.j2 | 2 ++ 2 files changed, 3 insertions(+) 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 index 29532640997..ce777261dd0 100644 --- 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/ansible/roles/schulcloud-server-core/templates/data-deletion-trigger-cronjob-configmap.yml.j2 b/ansible/roles/schulcloud-server-core/templates/data-deletion-trigger-cronjob-configmap.yml.j2 index 060e21d1526..1c448c58544 100644 --- a/ansible/roles/schulcloud-server-core/templates/data-deletion-trigger-cronjob-configmap.yml.j2 +++ b/ansible/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" + From 1a959c51511ab38c566878a046fbf7bc6bf6fbfd Mon Sep 17 00:00:00 2001 From: Uwe Ilgenstein Date: Thu, 13 Jun 2024 17:13:21 +0200 Subject: [PATCH 2/2] add missing else --- .../board/service/internal/board-node-delete-hooks.service.ts | 2 ++ 1 file changed, 2 insertions(+) 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 index cdb1805abf6..bb10e6e579e 100644 --- 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))); }