Merge pull request #28 from Boehringer-Ingelheim/rc/v0.0.13

add roc css dependencies
Boehringer-Ingelheim · Oct 25, 2024 · 3d0e458 · 3d0e458
2 parents ee12608 + 3560585
commit 3d0e458
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/R/mod_roc.R b/R/mod_roc.R
@@ -4212,17 +4212,6 @@ parse_ci <- function(str) {
   sort(unique(as.numeric(strsplit(str, ";", fixed = TRUE)[[1]])))
 }
 
-roc_dependencies <- function() {
-  htmltools::htmlDependency(
-    name = "dv.explorer.parameter",
-    version = "1.0",
-    package = "dv.explorer.parameter",
-    src = "assets",
-    stylesheet = "css/roc.css",
-    all_files = FALSE
-  )
-}
-
 # https://github.com/vegawidget/vegawidget/issues/217
 # https://github.com/vegawidget/vegawidget/issues/218
 # To fix this issue we will wrap the elements in a renderUI that will solve this problem

diff --git a/R/utils_html_dependencies.R b/R/utils_html_dependencies.R
@@ -1,4 +1,3 @@
-# handle dependency
 #' @keywords internal
 ebas_sel_css_dep <- function() {
   htmltools::htmlDependency(
@@ -36,9 +35,8 @@ roc_dependencies <- function() {
   htmltools::htmlDependency(
     name = "dv.explorer.parameter",
     version = "1.0",
-    package = "dv.explorer.parameter",
-    src = "assets",
-    stylesheet = "css/bp.css",
+    src = system.file("assets", package = "dv.explorer.parameter", mustWork = TRUE),
+    stylesheet = "css/roc.css",
     all_files = FALSE
   )
 }
diff --git a/inst/assets/css/roc.css b/inst/assets/css/roc.css
@@ -0,0 +1,8 @@
+.roc_menu_bar {
+    margin-bottom: 20px;
+}
+
+.table-condensed.roc_info_table {
+    margin-bottom: 5px;
+}
+
diff --git a/tests/testthat/test-lineplot_app.R b/tests/testthat/test-lineplot_app.R
@@ -244,7 +244,7 @@ test_that("default values are set", {
     default_par = c("PARAM22", "PARAM23"),
     default_val = "VALUE2",
     default_visit_var = "VISIT2",
-    default_visit_val = c(1, 9),
+    default_visit_val = list(VISIT2 = c(1, 9)),
     default_main_group = "CAT2",
     default_sub_group = "CAT2"
   )
@@ -265,7 +265,7 @@ test_that("default values are set", {
   expect_equal(input_values[[ID$INPUT$CENT]], srv_defaults[["default_centrality_function"]])
   expect_equal(input_values[[ID$INPUT$DISP]], srv_defaults[["default_dispersion_function"]])
   expect_equal(input_values[[ID$INPUT$VIS_COL]], srv_defaults[["default_visit_var"]])
-  expect_equal(input_values[[ID$INPUT$VIS]], as.character(srv_defaults[["default_visit_val"]]))
+  expect_equal(input_values[[ID$INPUT$VIS]], as.character(srv_defaults[["default_visit_val"]][["VISIT2"]]))
   expect_equal(input_values[[ID$INPUT$VAL]], srv_defaults[["default_val"]])
   expect_equal(input_values[[ID$INPUT$MGRP]], srv_defaults[["default_main_group"]])
   expect_equal(input_values[[ID$INPUT$SGRP]], srv_defaults[["default_sub_group"]])