Merge pull request #7 from Boehringer-Ingelheim/remove_golem

Remove golem

DESCRIPTION

@@ -8,7 +8,6 @@ Authors@R: c(person("Boehringer-Ingelheim Pharma GmbH & Co.KG", role = c("cph",
 Description: DaVinci Module Manager.
 License: Apache License (>= 2)
 Imports: 
-    golem (>= 0.3.1),
     shiny (>= 1.7.0),
     glue (>= 1.4.2),
     htmltools (>= 0.5.2),
@@ -18,7 +17,6 @@ Imports:
     purrr (>= 0.3.4),
     dplyr (>= 1.0.3),
     dv.filter (>= 1.0.0),
-    dv.loader (>= 1.0.0),
     lubridate (>= 1.7.9.2),
     shinymeta (>= 0.2.0.1),
     shinyjs (>= 2.0.0),
@@ -28,7 +26,7 @@ Imports:
     cli (>= 3.3.0)
 Encoding: UTF-8
 LazyData: true
-RoxygenNote: 7.3.0
+RoxygenNote: 7.3.1
 Roxygen: list(markdown = TRUE)
 Suggests: 
     testthat (>= 3.0.1),

NAMESPACE

@@ -22,4 +22,3 @@ export(simple_UI)
 export(simple_server)
 importFrom(dplyr,"%>%")
 importFrom(dplyr,.data)
-importFrom(golem,get_golem_options)

NEWS.md

@@ -1,3 +1,7 @@
+# dv.manager 2.1.1-9000
+
+- Removes `golem` dependency
+
 # dv.manager 2.1.1
 
 - General code housekeeping

R/app_config.R

@@ -1,29 +0,0 @@
-#' Access files in the current app
-#'
-#' @param ... Character vector specifying directory and or file to
-#'     point to inside the current package.
-#'
-#' @noRd
-app_sys <- function(...) {
-  system.file(..., package = "dv.manager")
-}
-
-
-#' #' Read App Config
-#' #'
-#' #' @param value Value to retrieve from the config file.
-#' #' @param config R_CONFIG_ACTIVE value.
-#' #' @param use_parent Logical, scan the parent directory for config file.
-#' #'
-#' #' @noRd
-#' get_golem_config <- function(value,
-#'                              config = Sys.getenv("R_CONFIG_ACTIVE", "default"),
-#'                              use_parent = TRUE) {
-#'   config::get(
-#'     value = value,
-#'     config = config,
-#'     # Modify this if your config file is somewhere else:
-#'     file = app_sys("golem-config.yml"),
-#'     use_parent = use_parent
-#'   )
-#' }

R/app_server.R

@@ -1,10 +1,5 @@
 #' Server side of the dv.manager
 #'
-#' @section golem:
-#' This server side is built as a golem application. Therefore it will make use of the [golem::get_golem_options]
-#' functionality. Particularly, it will receive three variables through this channel: module_list, data and filter_data.
-#' All this variables are specified in the [dv.manager::run_app()] call.
-#'
 #' @section data:
 #' *data* is the fundamental data source for the application launched by the dv.manager
 #'   - This data source is a named list of:
@@ -49,34 +44,30 @@
 #'
 #' @keywords internal
 
-app_server <- function(input = NULL, output = NULL, session = NULL, id = NULL) {
-  if (is.null(id)) {
-    log_inform("As app")
-    return(app_server_golem(input, output, session)) # If id is null then I am calling it as a base app
-  } else { # Otherwise I am calling it as a module inside another app
-    return(
-      shiny::moduleServer(
-        id,
-        app_server_golem
-      )
-    )
-  }
-}
-
-# Used for future decoupling from golem in the future
-app_server_golem <- function(input, output, session) {
+app_server <- function(input = NULL, output = NULL, session = NULL) {
   opts <- list(
-    "module_list" = golem::get_golem_options("module_list"),
-    "data" = golem::get_golem_options("data"),
-    "filter_data" = golem::get_golem_options("filter_data"),
-    "filter_key" = golem::get_golem_options("filter_key"),
-    "startup_msg" = golem::get_golem_options("startup_msg"),
-    "reload_period" = golem::get_golem_options("reload_period")
+    "module_list" = get_config("module_list"),
+    "data" = get_config("data"),
+    "filter_data" = get_config("filter_data"),
+    "filter_key" = get_config("filter_key"),
+    "startup_msg" = get_config("startup_msg"),
+    "reload_period" = get_config("reload_period")
   )
 
   app_server_(input, output, session, opts)
 }
 
+app_server_module <- function(id) {
+  opts <- list(
+    "module_list" = get_config("module_list"),
+    "data" = get_config("data"),
+    "filter_data" = get_config("filter_data"),
+    "filter_key" = get_config("filter_key"),
+    "startup_msg" = get_config("startup_msg"),
+    "reload_period" = get_config("reload_period")
+  )
+  shiny::moduleServer(id = id, module = function(input, output, session) app_server_(input, output, session, opts))
+}
 
 app_server_ <- function(input, output, session, opts) {
   ns <- session[["ns"]]

R/app_ui.R

@@ -1,7 +1,7 @@
 #' The application User-Interface using an HTML template
 #'
 #' @param id This parameter can be either an string id if the app_ui is being used as a module or
-#' a request if the app_ui is being used as an standalone application created in golem then it becomes
+#' a request if the app_ui is being used as an standalone application then it becomes
 #' a Internal parameter for `{shiny}`
 #'     DO NOT REMOVE.
 #'
@@ -20,8 +20,8 @@ app_ui <- function(id) {
     stop("Unknown value type in id")
   }
 
-  data <- golem::get_golem_options("data")
-  module_list <- golem::get_golem_options("module_list")
+  data <- get_config("data")
+  module_list <- get_config("module_list")
 
   log_inform("Initializing HTML template UI")
   log_inform(glue::glue(
@@ -99,8 +99,8 @@ app_ui <- function(id) {
     )))))
 
   shiny::fluidPage(
-    golem_add_external_resources(),
-    theme = get_app_theme(), # "bgc-color" = "#002f62"),
+    insert_header_add_resources(app_title = get_config("title")),
+    theme = get_app_theme(),
     class = "display-grid",
     sidebar,
     do.call(shiny::tabsetPanel, c(