From c247699b23c368e51cf7e742f014251598b8d0ed Mon Sep 17 00:00:00 2001 From: madeliri Date: Fri, 24 Apr 2026 21:48:25 +0300 Subject: [PATCH] =?UTF-8?q?refactor:=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D1=85=D0=BE=D0=B4?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=BA=20=D1=84=D0=BE=D1=80=D0=BC=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8E=20=D0=BA=D0=BE=D0=BD=D1=84?= =?UTF-8?q?=D0=B8=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .Rprofile | 14 +++++++++++++- modules/global_options.R | 10 +++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.Rprofile b/.Rprofile index d6098c7..94c7894 100644 --- a/.Rprofile +++ b/.Rprofile @@ -4,7 +4,6 @@ source("renv/activate.R") (function() { paths <- c( - "R_CONFIG_ACTIVE", "AUTH_DB_KEY" ) @@ -18,3 +17,16 @@ source("renv/activate.R") )) } })() + +(function() { + + if (Sys.getenv("R_CONFIG_ACTIVE") == "") { + Sys.setenv(R_CONFIG_ACTIVE = "prod") + cli::cli_inform(c( + "i" = "Не указана конфигурация по умолчанию, автоматически установлен 'prod'. Для изменения конфигурации добавьте в {.file .Renviron}:" + )) + cli::cli_code(paste0("R_CONFIG_ACTIVE", "=")) + + } + +})() diff --git a/modules/global_options.R b/modules/global_options.R index 2e1c798..c6b63e7 100644 --- a/modules/global_options.R +++ b/modules/global_options.R @@ -10,15 +10,19 @@ set_global_options = function( config_params_to_check <- c( "form_app_version", + "form_id", + "form_name", "form_app_configure_path", "form_auth_enabled", - "form_id", - "form_name" + "form_schemes" ) expected_params_in_config <- config_params_to_check %in% names(config::get()) if (!all(expected_params_in_config)) { - cli::cli_abort(c("ну так не пойдет:", paste("-", config_params_to_check[!expected_params_in_config]))) + cli::cli_abort(c( + "Необходимо добавить в файл конфига {.file config.yml} следующие параметры:", + paste0(config_params_to_check[!expected_params_in_config], ":") + )) } options(