diff --git a/api/src/core/config.py b/api/src/core/config.py index 4344812..dc8e269 100644 --- a/api/src/core/config.py +++ b/api/src/core/config.py @@ -4,10 +4,7 @@ from typing import List from pydantic import AliasChoices, Field from pydantic_settings import BaseSettings, SettingsConfigDict -if os.environ.get("APP_ENV", "dev") == "test": - prefix = "OPENBAO__SETTINGS_TEST" -else: - prefix = "OPENBAO__SETTINGS" +prefix = "OPENBAO__SETTINGS" class Settings(BaseSettings): diff --git a/web/src/components/RealtimeTable/contexts/RealtimeContext.js b/web/src/components/RealtimeTable/contexts/RealtimeContext.js index 4dcd5b5..3d1248b 100644 --- a/web/src/components/RealtimeTable/contexts/RealtimeContext.js +++ b/web/src/components/RealtimeTable/contexts/RealtimeContext.js @@ -27,9 +27,8 @@ export const RealtimeProvider = ({ direction, userId, }) => { - // Формируем URL - const wsUrl = `${process.env.REACT_APP_WS_URL || "ws://localhost:8000"}/api/v1/ws/form/${formId}/sheet/${sheetName}${direction ? `?direction=${direction}` : ""}`; - + // Формируем URL (кастомные секреты на фронте пока недоступны, делаем через REACT_APP_ROOT_PATH) + const wsUrl = `${(process.env.REACT_APP_API_URL || process.env.REACT_APP_API_URL || process.env.REACT_APP_ROOT_PATH || "ws://localhost:8000").replace(/^http/, "ws")}/api/v1/ws/form/${formId}/sheet/${sheetName}${direction ? `?direction=${direction}` : ""}`; console.log() const handleMessage = useCallback((data) => { // Обработка ошибок if (data.error) {