Skip to content

Commit bf4c29e

Browse files
committed
advertise it
1 parent a936e87 commit bf4c29e

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

services/web/server/src/simcore_service_webserver/application_settings.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,7 @@ def _get_disabled_advertised_plugins(self) -> list[str]:
503503
"WEBSERVER_LICENSES",
504504
"WEBSERVER_PAYMENTS",
505505
"WEBSERVER_SCICRUNCH",
506+
"WEBSERVER_REALTIME_COLLABORATION",
506507
}
507508
return [_ for _ in advertised_plugins if not self.is_enabled(_)] + [
508509
# NOTE: Permanently retired in https://github.com/ITISFoundation/osparc-simcore/pull/7182
@@ -579,6 +580,9 @@ def to_client_statics(self) -> dict[str, Any]:
579580
"WEBSERVER_PROJECTS": {
580581
"PROJECTS_MAX_NUM_RUNNING_DYNAMIC_NODES",
581582
},
583+
"WEBSERVER_REALTIME_COLLABORATION": {
584+
"RTC_MAX_NUMBER_OF_USERS",
585+
},
582586
"WEBSERVER_SESSION": {"SESSION_COOKIE_MAX_AGE"},
583587
"WEBSERVER_TRASH": {
584588
"TRASH_RETENTION_DAYS",

services/web/server/tests/unit/isolated/test_application_settings.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ def test_settings_to_client_statics(app_settings: ApplicationSettings):
6565
# special alias
6666
assert statics["stackName"] == "master-simcore"
6767
assert statics["pluginsDisabled"] == [
68+
"WEBSERVER_REALTIME_COLLABORATION",
6869
"WEBSERVER_META_MODELING",
6970
"WEBSERVER_VERSION_CONTROL",
7071
]
@@ -78,16 +79,23 @@ def test_settings_to_client_statics_plugins(
7879
"WEBSERVER_SCICRUNCH",
7980
"WEBSERVER_META_MODELING",
8081
"WEBSERVER_VERSION_CONTROL",
82+
"WEBSERVER_REALTIME_COLLABORATION",
8183
}
8284
for name in disable_plugins:
8385
monkeypatch.setenv(name, "null")
8486

8587
monkeypatch.setenv("WEBSERVER_FOLDERS", "0")
8688
disable_plugins.add("WEBSERVER_FOLDERS")
8789

90+
monkeypatch.setenv(
91+
"WEBSERVER_REALTIME_COLLABORATION", '{"RTC_MAX_NUMBER_OF_USERS":3}'
92+
)
93+
disable_plugins.remove("WEBSERVER_REALTIME_COLLABORATION")
94+
8895
settings = ApplicationSettings.create_from_envs()
8996
statics = settings.to_client_statics()
9097

98+
# -------------
9199
print("STATICS:\n", json_dumps(statics, indent=1))
92100

93101
assert settings.WEBSERVER_LOGIN
@@ -108,6 +116,13 @@ def test_settings_to_client_statics_plugins(
108116
== settings.WEBSERVER_SESSION.SESSION_COOKIE_MAX_AGE
109117
)
110118

119+
assert "WEBSERVER_REALTIME_COLLABORATION" in statics["pluginsDisabled"]
120+
assert settings.WEBSERVER_REALTIME_COLLABORATION
121+
assert (
122+
statics["webserverRealtimeCollaboration"]["RTC_MAX_NUMBER_OF_USERS"]
123+
== settings.WEBSERVER_REALTIME_COLLABORATION.RTC_MAX_NUMBER_OF_USERS
124+
)
125+
111126
assert statics["vcsReleaseTag"]
112127
assert TypeAdapter(HttpUrl).validate_python(statics["vcsReleaseUrl"])
113128

0 commit comments

Comments
 (0)