From 9fc0ab2ffef845c81a10fea1581b4311c7e74b4f Mon Sep 17 00:00:00 2001 From: kartikeya kirar Date: Fri, 15 Mar 2024 19:19:43 +0530 Subject: [PATCH 1/2] 445 unify html tags (#259) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit part of https://github.com/insightsengineering/teal.slice/issues/445 for teal.osprey package --------- Co-authored-by: André Veríssimo <211358+averissimo@users.noreply.github.com> --- R/tm_g_ae_oview.R | 2 +- R/tm_g_ae_sub.R | 2 +- R/tm_g_butterfly.R | 2 +- R/tm_g_events_term_id.R | 2 +- R/tm_g_heat_bygrade.R | 4 ++-- R/tm_g_patient_profile.R | 6 +++--- R/tm_g_spiderplot.R | 8 ++++---- R/tm_g_swimlane.R | 24 ++++++++++++------------ R/tm_g_waterfall.R | 8 ++++---- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/R/tm_g_ae_oview.R b/R/tm_g_ae_oview.R index 48545dea..9bd0508c 100644 --- a/R/tm_g_ae_oview.R +++ b/R/tm_g_ae_oview.R @@ -127,7 +127,7 @@ ui_g_ae_oview <- function(id, ...) { output = teal.widgets::white_small_well( plot_decorate_output(id = ns(NULL)) ), - encoding = div( + encoding = tags$div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), ### diff --git a/R/tm_g_ae_sub.R b/R/tm_g_ae_sub.R index d1b21e2b..e0e6f53a 100644 --- a/R/tm_g_ae_sub.R +++ b/R/tm_g_ae_sub.R @@ -102,7 +102,7 @@ ui_g_ae_sub <- function(id, ...) { output = teal.widgets::white_small_well( plot_decorate_output(id = ns(NULL)) ), - encoding = div( + encoding = tags$div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), ### diff --git a/R/tm_g_butterfly.R b/R/tm_g_butterfly.R index daebe003..06392139 100644 --- a/R/tm_g_butterfly.R +++ b/R/tm_g_butterfly.R @@ -164,7 +164,7 @@ ui_g_butterfly <- function(id, ...) { output = teal.widgets::white_small_well( teal.widgets::plot_with_settings_ui(id = ns("butterflyplot")) ), - encoding = div( + encoding = tags$div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), ### diff --git a/R/tm_g_events_term_id.R b/R/tm_g_events_term_id.R index c34a8485..60da36db 100644 --- a/R/tm_g_events_term_id.R +++ b/R/tm_g_events_term_id.R @@ -103,7 +103,7 @@ ui_g_events_term_id <- function(id, ...) { output = teal.widgets::white_small_well( plot_decorate_output(id = ns(NULL)) ), - encoding = div( + encoding = tags$div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), ### diff --git a/R/tm_g_heat_bygrade.R b/R/tm_g_heat_bygrade.R index c676b769..19e68271 100644 --- a/R/tm_g_heat_bygrade.R +++ b/R/tm_g_heat_bygrade.R @@ -194,7 +194,7 @@ ui_g_heatmap_bygrade <- function(id, ...) { output = teal.widgets::white_small_well( plot_decorate_output(id = ns(NULL)) ), - encoding = div( + encoding = tags$div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), ### @@ -234,7 +234,7 @@ ui_g_heatmap_bygrade <- function(id, ...) { multiple = FALSE ), helpText("Plot conmed"), - div( + tags$div( class = "pretty-left-border", if (!is.na(args$cm_dataname)) { checkboxInput( diff --git a/R/tm_g_patient_profile.R b/R/tm_g_patient_profile.R index fe19d5f4..dd3ba667 100644 --- a/R/tm_g_patient_profile.R +++ b/R/tm_g_patient_profile.R @@ -217,7 +217,7 @@ ui_g_patient_profile <- function(id, ...) { output = teal.widgets::white_small_well( teal.widgets::plot_with_settings_ui(id = ns("patientprofileplot")) ), - encoding = div( + encoding = tags$div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), ### @@ -228,7 +228,7 @@ ui_g_patient_profile <- function(id, ...) { choices = a$patient_id$choices, selected = a$patient_id$selected ), - div( + tags$div( tagList( helpText("Select", tags$code("ADaM"), "Domains"), checkboxGroupInput( @@ -320,7 +320,7 @@ ui_g_patient_profile <- function(id, ...) { ), textInput( ns("x_limit"), - label = div( + label = tags$div( "Study Days Range", tags$br(), helpText("Enter TWO numeric values of study days range, separated by comma (eg. -28, 750)") diff --git a/R/tm_g_spiderplot.R b/R/tm_g_spiderplot.R index aa757374..485ec72e 100644 --- a/R/tm_g_spiderplot.R +++ b/R/tm_g_spiderplot.R @@ -140,13 +140,13 @@ ui_g_spider <- function(id, ...) { output = teal.widgets::white_small_well( teal.widgets::plot_with_settings_ui(id = ns("spiderplot")) ), - encoding = div( + encoding = tags$div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), ### tags$label("Encodings", class = "text-primary"), helpText("Analysis data:", tags$code(a$dataname)), - div( + tags$div( class = "pretty-left-border", teal.widgets::optionalSelectInput( ns("paramcd"), @@ -210,7 +210,7 @@ ui_g_spider <- function(id, ...) { ), textInput( ns("vref_line"), - label = div( + label = tags$div( "Vertical Reference Line(s)", tags$br(), helpText("Enter numeric value(s) of vertical reference lines, separated by comma (eg. -2, 1)") @@ -219,7 +219,7 @@ ui_g_spider <- function(id, ...) { ), textInput( ns("href_line"), - label = div( + label = tags$div( "Hortizontal Reference Line(s)", tags$br(), helpText("Enter numeric value(s) of horizontal reference lines, separated by comma (eg. -2, 1)") diff --git a/R/tm_g_swimlane.R b/R/tm_g_swimlane.R index 3cc44166..c9527551 100644 --- a/R/tm_g_swimlane.R +++ b/R/tm_g_swimlane.R @@ -180,13 +180,13 @@ ui_g_swimlane <- function(id, ...) { output = teal.widgets::white_small_well( teal.widgets::plot_with_settings_ui(id = ns("swimlaneplot")) ), - encoding = div( + encoding = tags$div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), ### tags$label("Encodings", class = "text-primary"), - helpText("Analysis data:", code(a$dataname)), - div( + helpText("Analysis data:", tags$code(a$dataname)), + tags$div( class = "pretty-left-border", teal.widgets::optionalSelectInput( ns("bar_var"), @@ -194,7 +194,7 @@ ui_g_swimlane <- function(id, ...) { choices = a$bar_var$choices, selected = a$bar_var$selected, multiple = FALSE, - label_help = helpText("from ", code("ADSL")) + label_help = helpText("from ", tags$code("ADSL")) ), teal.widgets::optionalSelectInput( ns("bar_color_var"), @@ -202,7 +202,7 @@ ui_g_swimlane <- function(id, ...) { choices = a$bar_color_var$choices, selected = a$bar_color_var$selected, multiple = FALSE, - label_help = helpText("from ", code("ADSL")) + label_help = helpText("from ", tags$code("ADSL")) ) ), teal.widgets::optionalSelectInput( @@ -211,9 +211,9 @@ ui_g_swimlane <- function(id, ...) { choices = a$sort_var$choices, selected = a$sort_var$selected, multiple = FALSE, - label_help = helpText("from ", code("ADSL")) + label_help = helpText("from ", tags$code("ADSL")) ), - div( + tags$div( class = "pretty-left-border", if (a$dataname == "ADSL") { NULL @@ -226,7 +226,7 @@ ui_g_swimlane <- function(id, ...) { choices = a$marker_pos_var$choices, selected = a$marker_pos_var$selected, multiple = FALSE, - label_help = helpText("from ", code(a$dataname)) + label_help = helpText("from ", tags$code(a$dataname)) ) }, uiOutput(ns("marker_shape_sel")), @@ -238,11 +238,11 @@ ui_g_swimlane <- function(id, ...) { choices = a$anno_txt_var$choices, selected = a$anno_txt_var$selected, multiple = TRUE, - label_help = helpText("from ", code("ADSL")) + label_help = helpText("from ", tags$code("ADSL")) ), textInput( ns("vref_line"), - label = div( + label = tags$div( "Vertical Reference Line(s)", tags$br(), helpText("Enter numeric value(s) of reference lines, separated by comma (eg. 100, 200)") @@ -303,7 +303,7 @@ srv_g_swimlane <- function(id, ns("marker_shape_var"), "Marker Shape", choices = marker_shape_var$choices, selected = marker_shape_var$selected, multiple = FALSE, - label_help = helpText("from ", code(dataname)) + label_help = helpText("from ", tags$code(dataname)) ) } }) @@ -316,7 +316,7 @@ srv_g_swimlane <- function(id, ns("marker_color_var"), "Marker Color", choices = marker_color_var$choices, selected = marker_color_var$selected, multiple = FALSE, - label_help = helpText("from ", code(dataname)) + label_help = helpText("from ", tags$code(dataname)) ) } }) diff --git a/R/tm_g_waterfall.R b/R/tm_g_waterfall.R index 22ac1d37..af5fa174 100644 --- a/R/tm_g_waterfall.R +++ b/R/tm_g_waterfall.R @@ -156,7 +156,7 @@ ui_g_waterfall <- function(id, ...) { output = teal.widgets::white_small_well( teal.widgets::plot_with_settings_ui(id = ns("waterfallplot")) ), - encoding = div( + encoding = tags$div( ### Reporter teal.reporter::simple_reporter_ui(ns("simple_reporter")), ### @@ -237,7 +237,7 @@ ui_g_waterfall <- function(id, ...) { ), textInput( ns("href_line"), - label = div( + label = tags$div( "Horizontal Reference Line(s)", tags$br(), helpText("Enter numeric value(s) of reference lines, separated by comma (eg. -10, 20)") @@ -246,7 +246,7 @@ ui_g_waterfall <- function(id, ...) { ), textInput( ns("ytick_at"), - label = div( + label = tags$div( "Y-axis Interval", tags$br(), helpText("Enter a numeric value of Y axis interval") @@ -255,7 +255,7 @@ ui_g_waterfall <- function(id, ...) { ), textInput( ns("gap_point_val"), - label = div( + label = tags$div( "Break High Bars", tags$br(), helpText("Enter a numeric value to break very high bars") From cfdc31493e36f4f7999f6ffd8d739ede27c9de72 Mon Sep 17 00:00:00 2001 From: kartikeyakirar Date: Fri, 15 Mar 2024 13:50:43 +0000 Subject: [PATCH 2/2] [skip actions] Bump version to 0.1.16.9014 --- DESCRIPTION | 4 ++-- NEWS.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 5175a282..16224c13 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: teal.osprey Title: 'teal' Modules for TLG Functions in Osprey -Version: 0.1.16.9013 -Date: 2024-03-14 +Version: 0.1.16.9014 +Date: 2024-03-15 Authors@R: c( person("Nina", "Qi", , "qit3@gene.com", role = c("aut", "cre")), person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index 6fc81a49..2b0ebd2e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.osprey 0.1.16.9013 +# teal.osprey 0.1.16.9014 ### Breaking Changes * Adapted all modules to use `teal_data` objects.