WEBDIENSTE/lasuite-docs
1
0
Fork 0
mirror of https://github.com/suitenumerique/docs.git synced 2026-08-17 21:25:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

♻️(core) fix typo in settings COLLABORATION_WS_NOT_CONNECTED_READY_ONLY

Browse Source 
The settings COLLABORATION_WS_NOT_CONNECTED_READY_ONLY contains a typo.
We don't want to see READY_ONLY but READ_ONLY. This commit fix the typo
and change everywhere in the codebase the settings name.
This commit is contained in:
Manuel Raynaud
2026-07-06 08:55:21 +02:00
parent e0287a613e
commit b01e6d58fd
15 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -24,6 +24,7 @@ and this project adheres to
- ♿️(frontend) align search modal field label with placeholder #2384
- 🚚(frontend) move Waffle to bottom left #2455
- ♿️(frontend) remove redundant aria-label on table of contents links #2459
- ♻️(core) fix typo in settings COLLABORATION_WS_NOT_CONNECTED_READY_ONLY #2481
### Fixed
documentation/env.md
+1 -1
View File
@@ -35,7 +35,7 @@ These are the environment variables you can set for the `impress-backend` contai
| COLLABORATION_API_URL | Collaboration api host | |
| COLLABORATION_SERVER_SECRET | Collaboration api secret | |
| COLLABORATION_WS_INACTIVITY_TIMEOUT | Timeout (in seconds) after which the user is considered inactive when there is no activity. The WebSocket is closed after this inactivity period. `None` means disabled. | None |
| COLLABORATION_WS_NOT_CONNECTED_READY_ONLY | Users not connected to the collaboration server cannot edit | false |
| COLLABORATION_WS_NOT_CONNECTED_READ_ONLY | Users not connected to the collaboration server cannot edit | false |
| COLLABORATION_WS_URL | Collaboration websocket url | |
| CONVERSION_API_CONTENT_FIELD | Conversion api content field | content |
| CONVERSION_API_ENDPOINT | Conversion API endpoint | convert |
env.d/development/common
+1 -1
View File
@@ -76,7 +76,7 @@ COLLABORATION_API_URL=http://y-provider-development:4444/collaboration/api/
COLLABORATION_BACKEND_BASE_URL=http://app-dev:8000
COLLABORATION_SERVER_ORIGIN=http://localhost:3000
COLLABORATION_SERVER_SECRET=my-secret
COLLABORATION_WS_NOT_CONNECTED_READY_ONLY=true
COLLABORATION_WS_NOT_CONNECTED_READ_ONLY=true
COLLABORATION_WS_URL=ws://localhost:4444/collaboration/ws/
COLLABORATION_WS_INACTIVITY_TIMEOUT=15 # Seconds
src/backend/core/api/viewsets.py
+4 -4
View File
@@ -805,7 +805,7 @@ class DocumentViewSet(
"""Check rules about collaboration."""
if (
not serializer.validated_data.get("websocket", False)
and settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY
and settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY
and not self._can_user_edit_document(serializer.instance.id, set_cache=True)
):
raise drf.exceptions.PermissionDenied(
@@ -825,7 +825,7 @@ class DocumentViewSet(
can_edit = (
True
if not settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY
if not settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY
else self._can_user_edit_document(document.id)
)
@@ -2049,7 +2049,7 @@ class DocumentViewSet(
if (
not serializer.validated_data.get("websocket", False)
and settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY
and settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY
and not self._can_user_edit_document(document.id, set_cache=True)
):
raise drf.exceptions.PermissionDenied(
@@ -3071,7 +3071,7 @@ class ConfigView(drf.views.APIView):
"AI_FEATURE_LEGACY_ENABLED",
"API_USERS_SEARCH_QUERY_MIN_LENGTH",
"COLLABORATION_WS_URL",
"COLLABORATION_WS_NOT_CONNECTED_READY_ONLY",
"COLLABORATION_WS_NOT_CONNECTED_READ_ONLY",
"COLLABORATION_WS_INACTIVITY_TIMEOUT",
"CONVERSION_FILE_EXTENSIONS_ALLOWED",
"CONVERSION_FILE_MAX_SIZE",
src/backend/core/tests/documents/test_api_documents_can_edit.py
+9 -9
View File
@@ -21,7 +21,7 @@ def test_api_documents_can_edit_anonymous(settings, ws_not_connected_ready_only,
session_key = client.session.session_key
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = ws_not_connected_ready_only
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = ws_not_connected_ready_only
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -56,7 +56,7 @@ def test_api_documents_can_edit_authenticated_no_websocket(
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = ws_not_connected_ready_only
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = ws_not_connected_ready_only
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -92,7 +92,7 @@ def test_api_documents_can_edit_authenticated_no_websocket_user_already_editing(
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -127,7 +127,7 @@ def test_api_documents_can_edit_no_websocket_other_user_connected_to_websocket(
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -159,7 +159,7 @@ def test_api_documents_can_edit_user_connected_to_websocket(settings):
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -194,7 +194,7 @@ def test_api_documents_can_edit_websocket_server_unreachable_fallback_to_no_webs
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -229,7 +229,7 @@ def test_api_documents_can_edit_websocket_server_unreachable_fallback_to_no_webs
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -265,7 +265,7 @@ def test_api_documents_can_edit_websocket_server_room_not_found(
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -300,7 +300,7 @@ def test_api_documents_can_edit_websocket_server_room_not_found_other_already_ed
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
src/backend/core/tests/documents/test_api_documents_content_update.py
+9 -9
View File
@@ -269,7 +269,7 @@ def test_api_documents_content_update_authenticated_no_websocket(settings):
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -305,7 +305,7 @@ def test_api_documents_content_update_authenticated_no_websocket_user_already_ed
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -340,7 +340,7 @@ def test_api_documents_content_update_no_websocket_other_user_connected_to_webso
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -374,7 +374,7 @@ def test_api_documents_content_update_user_connected_to_websocket(settings):
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -410,7 +410,7 @@ def test_api_documents_content_update_websocket_server_unreachable_fallback_to_n
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -446,7 +446,7 @@ def test_api_content_update_websocket_server_unreachable_fallback_to_no_websocke
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -481,7 +481,7 @@ def test_api_content_update_websocket_server_room_not_found_fallback_to_no_webso
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -513,7 +513,7 @@ def test_api_documents_content_update_force_websocket_param_to_true(settings):
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -546,7 +546,7 @@ def test_api_documents_content_update_feature_flag_disabled(settings):
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = False
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = False
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
src/backend/core/tests/documents/test_api_documents_update.py
+17 -17
View File
@@ -323,7 +323,7 @@ def test_api_documents_update_authenticated_no_websocket(settings):
new_document_values["websocket"] = False
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -366,7 +366,7 @@ def test_api_documents_update_authenticated_no_websocket_user_already_editing(se
new_document_values["websocket"] = False
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -405,7 +405,7 @@ def test_api_documents_update_no_websocket_other_user_connected_to_websocket(set
new_document_values["websocket"] = False
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -443,7 +443,7 @@ def test_api_documents_update_user_connected_to_websocket(settings):
new_document_values["websocket"] = False
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -487,7 +487,7 @@ def test_api_documents_update_websocket_server_unreachable_fallback_to_no_websoc
new_document_values["websocket"] = False
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -531,7 +531,7 @@ def test_api_documents_update_websocket_server_unreachable_fallback_to_no_websoc
new_document_values["websocket"] = False
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -572,7 +572,7 @@ def test_api_documents_update_websocket_server_room_not_found_fallback_to_no_web
new_document_values["websocket"] = False
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -650,7 +650,7 @@ def test_api_documents_update_feature_flag_disabled(settings):
new_document_values["websocket"] = False
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = False
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = False
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -983,7 +983,7 @@ def test_api_documents_patch_authenticated_no_websocket(settings):
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -1024,7 +1024,7 @@ def test_api_documents_patch_authenticated_no_websocket_user_already_editing(set
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -1059,7 +1059,7 @@ def test_api_documents_patch_no_websocket_other_user_connected_to_websocket(sett
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -1094,7 +1094,7 @@ def test_api_documents_patch_user_connected_to_websocket(settings):
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -1137,7 +1137,7 @@ def test_api_documents_patch_websocket_server_unreachable_fallback_to_no_websock
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -1180,7 +1180,7 @@ def test_api_documents_patch_websocket_server_unreachable_fallback_to_no_websock
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -1217,7 +1217,7 @@ def test_api_documents_patch_websocket_server_room_not_found_fallback_to_no_webs
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -1290,7 +1290,7 @@ def test_api_documents_patch_feature_flag_disabled(settings):
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = False
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = False
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
@@ -1375,7 +1375,7 @@ def test_api_documents_patch_empty_body(settings):
settings.COLLABORATION_API_URL = "http://example.com/"
settings.COLLABORATION_SERVER_SECRET = "secret-token"
settings.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = True
settings.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = True
endpoint_url = (
f"{settings.COLLABORATION_API_URL}get-connections/"
f"?room={document.id}&sessionKey={session_key}"
src/backend/core/tests/test_api_config.py
+2 -2
View File
@@ -25,7 +25,7 @@ pytestmark = pytest.mark.django_db
AI_FEATURE_LEGACY_ENABLED=False,
API_USERS_SEARCH_QUERY_MIN_LENGTH=6,
COLLABORATION_WS_URL="http://testcollab/",
COLLABORATION_WS_NOT_CONNECTED_READY_ONLY=True,
COLLABORATION_WS_NOT_CONNECTED_READ_ONLY=True,
COLLABORATION_WS_INACTIVITY_TIMEOUT=300,
CONVERSION_UPLOAD_ENABLED=False,
FRONTEND_CSS_URL="http://testcss/",
@@ -56,7 +56,7 @@ def test_api_config(is_authenticated):
"AI_FEATURE_LEGACY_ENABLED": False,
"API_USERS_SEARCH_QUERY_MIN_LENGTH": 6,
"COLLABORATION_WS_URL": "http://testcollab/",
"COLLABORATION_WS_NOT_CONNECTED_READY_ONLY": True,
"COLLABORATION_WS_NOT_CONNECTED_READ_ONLY": True,
"COLLABORATION_WS_INACTIVITY_TIMEOUT": 300,
"CONVERSION_FILE_EXTENSIONS_ALLOWED": [".docx", ".md"],
"CONVERSION_FILE_MAX_SIZE": 20971520,
src/backend/impress/settings.py
+7 -3
View File
@@ -521,9 +521,13 @@ class Base(Configuration):
COLLABORATION_WS_URL = values.Value(
None, environ_name="COLLABORATION_WS_URL", environ_prefix=None
)
COLLABORATION_WS_NOT_CONNECTED_READY_ONLY = values.BooleanValue(
False,
environ_name="COLLABORATION_WS_NOT_CONNECTED_READY_ONLY",
COLLABORATION_WS_NOT_CONNECTED_READ_ONLY = values.BooleanValue(
default=values.BooleanValue( # COLLABORATION_WS_NOT_CONNECTED_READY_ONLY compat
default=False,
environ_name="COLLABORATION_WS_NOT_CONNECTED_READY_ONLY",
environ_prefix=None,
),
environ_name="COLLABORATION_WS_NOT_CONNECTED_READ_ONLY",
environ_prefix=None,
)
COLLABORATION_WS_INACTIVITY_TIMEOUT = values.IntegerValue(
src/frontend/apps/e2e/__tests__/app-impress/doc-collaboration.spec.ts
+1 -1
View File
@@ -150,7 +150,7 @@ test.describe('Doc Collaboration', () => {
*/
await overrideConfig(page, {
COLLABORATION_WS_URL: 'ws://localhost:5555/collaboration/ws/',
COLLABORATION_WS_NOT_CONNECTED_READY_ONLY: true,
COLLABORATION_WS_NOT_CONNECTED_READ_ONLY: true,
});
await page.goto('/');
src/frontend/apps/e2e/__tests__/app-impress/utils-common.ts
+1 -1
View File
@@ -20,7 +20,7 @@ export const CONFIG = {
API_USERS_SEARCH_QUERY_MIN_LENGTH: 3,
COLLABORATION_WS_INACTIVITY_TIMEOUT: 15,
COLLABORATION_WS_URL: process.env.COLLABORATION_WS_URL,
COLLABORATION_WS_NOT_CONNECTED_READY_ONLY: true,
COLLABORATION_WS_NOT_CONNECTED_READ_ONLY: true,
CONVERSION_UPLOAD_ENABLED: true,
CONVERSION_FILE_EXTENSIONS_ALLOWED: ['.docx', '.md'],
CONVERSION_FILE_MAX_SIZE: 20971520,
src/frontend/apps/impress/src/core/config/api/useConfig.tsx
+1 -1
View File
@@ -49,7 +49,7 @@ export interface ConfigResponse {
AI_FEATURE_LEGACY_ENABLED?: boolean;
API_USERS_SEARCH_QUERY_MIN_LENGTH?: number;
COLLABORATION_WS_URL?: string;
COLLABORATION_WS_NOT_CONNECTED_READY_ONLY?: boolean;
COLLABORATION_WS_NOT_CONNECTED_READ_ONLY?: boolean;
COLLABORATION_WS_INACTIVITY_TIMEOUT?: number | null;
CONVERSION_FILE_EXTENSIONS_ALLOWED: string[];
CONVERSION_FILE_MAX_SIZE: number;
src/frontend/apps/impress/src/features/docs/doc-management/hooks/useIsCollaborativeEditable.tsx
+1 -1
View File
@@ -66,7 +66,7 @@ export const useIsCollaborativeEditable = (doc: Doc) => {
setIsLoading(false);
}, [_isEditable]);
if (!conf?.COLLABORATION_WS_NOT_CONNECTED_READY_ONLY) {
if (!conf?.COLLABORATION_WS_NOT_CONNECTED_READ_ONLY) {
return {
isEditable: true,
isLoading: false,
src/helm/env.d/dev/values.impress.yaml.gotmpl
+1 -1
View File
@@ -17,7 +17,7 @@ backend:
envVars:
COLLABORATION_SERVER_SECRET: my-secret
COLLABORATION_API_URL: https://docs.127.0.0.1.nip.io/collaboration/api/
COLLABORATION_WS_NOT_CONNECTED_READY_ONLY: False
COLLABORATION_WS_NOT_CONNECTED_READ_ONLY: False
CONVERSION_UPLOAD_ENABLED: True
DJANGO_CSRF_TRUSTED_ORIGINS: https://docs.127.0.0.1.nip.io
DJANGO_CONFIGURATION: Feature
src/helm/env.d/feature/values.impress.yaml.gotmpl
+1 -1
View File
@@ -19,7 +19,7 @@ backend:
COLLABORATION_SERVER_SECRET: my-secret
CONVERSION_UPLOAD_ENABLED: True
COLLABORATION_API_URL: https://{{ .Values.feature }}-docs.{{ .Values.domain }}/collaboration/api/
COLLABORATION_WS_NOT_CONNECTED_READY_ONLY: True
COLLABORATION_WS_NOT_CONNECTED_READ_ONLY: True
DJANGO_CSRF_TRUSTED_ORIGINS: https://{{ .Values.feature }}-docs.{{ .Values.domain }}
DJANGO_CONFIGURATION: Feature
DJANGO_ALLOWED_HOSTS: {{ .Values.feature }}-docs.{{ .Values.domain }}