From 7b0eb8d70db51b6c365e6d3e39ac6d31f6334dfc Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Thu, 14 Nov 2024 14:24:10 +0100 Subject: [PATCH] fix: Connect to shared sessions via internal session viewer In addition, enable Xpra sharing by default. --- backend/capellacollab/core/database/migration.py | 2 +- backend/capellacollab/sessions/routes.py | 2 +- helm/templates/routing/sessions.ingress.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/capellacollab/core/database/migration.py b/backend/capellacollab/core/database/migration.py index 1975591456..c39393bae7 100644 --- a/backend/capellacollab/core/database/migration.py +++ b/backend/capellacollab/core/database/migration.py @@ -162,7 +162,7 @@ def get_eclipse_session_configuration() -> ( if not core.LOCAL_DEVELOPMENT_MODE else "http://localhost:8080" ) - + "{CAPELLACOLLAB_SESSIONS_BASE_PATH}/?floating_menu=0&path={CAPELLACOLLAB_SESSIONS_BASE_PATH}/" + + "{CAPELLACOLLAB_SESSIONS_BASE_PATH}/?floating_menu=0&sharing=1&path={CAPELLACOLLAB_SESSIONS_BASE_PATH}/" ), cookies={}, sharing=tools_models.ToolSessionSharingConfiguration( diff --git a/backend/capellacollab/sessions/routes.py b/backend/capellacollab/sessions/routes.py index 04e810de7b..9f12be111e 100644 --- a/backend/capellacollab/sessions/routes.py +++ b/backend/capellacollab/sessions/routes.py @@ -280,7 +280,7 @@ def get_all_sessions( ) def get_session( session: models.DatabaseSession = fastapi.Depends( - injectables.get_existing_session + injectables.get_existing_session_including_shared ), ): return session diff --git a/helm/templates/routing/sessions.ingress.yaml b/helm/templates/routing/sessions.ingress.yaml index bada43e1db..9c67d2bb50 100644 --- a/helm/templates/routing/sessions.ingress.yaml +++ b/helm/templates/routing/sessions.ingress.yaml @@ -24,7 +24,7 @@ spec: rules: - http: paths: - - path: /session + - path: /session/ pathType: Prefix backend: service: