From 4c80458e0d14f11c33951f53c50cffaade464b56 Mon Sep 17 00:00:00 2001 From: Dinakar <26552821+dinakar29@users.noreply.github.com> Date: Tue, 26 Jul 2022 03:11:42 -0500 Subject: [PATCH 1/4] Update font awesome icon labels for FA 6 (#80) --- R/FilterStates.R | 4 ++-- R/FilteredData.R | 6 +++--- R/FilteredDataset.R | 2 +- man/init_filter_states.Rd | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/R/FilterStates.R b/R/FilterStates.R index 0d2fd9167..81ed7456d 100644 --- a/R/FilterStates.R +++ b/R/FilterStates.R @@ -36,7 +36,7 @@ #' \dontrun{ #' shinyApp( #' ui = fluidPage( -#' actionButton("clear", span(icon("times"), "Remove all filters")), +#' actionButton("clear", span(icon("xmark"), "Remove all filters")), #' rf$ui_add_filter_state(id = "add", data = df), #' rf$ui("states"), #' verbatimTextOutput("expr"), @@ -577,7 +577,7 @@ FilterStates <- R6::R6Class( # nolint actionLink( session$ns("remove"), label = "", - icon = icon("times-circle", lib = "font-awesome"), + icon = icon("circle-xmark", lib = "font-awesome"), class = "remove pull-right" ) ) diff --git a/R/FilteredData.R b/R/FilteredData.R index 15de431f4..ae3a063cc 100644 --- a/R/FilteredData.R +++ b/R/FilteredData.R @@ -603,7 +603,7 @@ FilteredData <- R6::R6Class( # nolint ns("filters_overview_contents") ), title = "Minimise panel", - tags$span(icon("minus-circle", lib = "font-awesome")) + tags$span(icon("circle-minus", lib = "font-awesome")) ) ) ), @@ -639,7 +639,7 @@ FilteredData <- R6::R6Class( # nolint ns("filter_active_vars_contents") ), title = "Minimise panel", - tags$span(icon("minus-circle", lib = "font-awesome")) + tags$span(icon("circle-minus", lib = "font-awesome")) ) ) ), @@ -672,7 +672,7 @@ FilteredData <- R6::R6Class( # nolint class = "remove pull-right", onclick = sprintf("$('#%s').toggle();", ns("filter_add_vars_contents")), title = "Minimise panel", - tags$span(icon("minus-circle", lib = "font-awesome")) + tags$span(icon("circle-minus", lib = "font-awesome")) ) ) ), diff --git a/R/FilteredDataset.R b/R/FilteredDataset.R index d50178aea..c60d49a21 100644 --- a/R/FilteredDataset.R +++ b/R/FilteredDataset.R @@ -350,7 +350,7 @@ FilteredDataset <- R6::R6Class( # nolint actionLink( ns("remove_filters"), label = "", - icon = icon("times-circle", lib = "font-awesome"), + icon = icon("circle-xmark", lib = "font-awesome"), class = "remove pull-right" ) ) diff --git a/man/init_filter_states.Rd b/man/init_filter_states.Rd index 21590d61d..0d4a8ec9c 100644 --- a/man/init_filter_states.Rd +++ b/man/init_filter_states.Rd @@ -50,7 +50,7 @@ rf <- teal.slice:::init_filter_states( \dontrun{ shinyApp( ui = fluidPage( - actionButton("clear", span(icon("times"), "Remove all filters")), + actionButton("clear", span(icon("xmark"), "Remove all filters")), rf$ui_add_filter_state(id = "add", data = df), rf$ui("states"), verbatimTextOutput("expr"), From a1873437b366209bde651cf049190916acfaa6e6 Mon Sep 17 00:00:00 2001 From: dinakar29 Date: Tue, 26 Jul 2022 08:12:39 +0000 Subject: [PATCH 2/4] [skip actions] Bump version to 0.1.1.9010 --- DESCRIPTION | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 205e57350..ebc5fdb75 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: teal.slice Title: Filter module for teal applications -Version: 0.1.1.9009 +Version: 0.1.1.9010 Date: 2022-06-09 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), diff --git a/NEWS.md b/NEWS.md index 07239d67c..5ea67157b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.slice 0.1.1.9009 +# teal.slice 0.1.1.9010 * Removed `CDISCFilteredDataset` class and functionality moved to `CDISCFilteredData`. * Changed constructor of `FilteredData` to not require `TealData` object. See `help(init_filtered_data)` for more details. From 067d9b51c024147b70f6b4e7e03417b53ef05ccc Mon Sep 17 00:00:00 2001 From: Maciej Nasinski Date: Tue, 26 Jul 2022 11:23:39 +0200 Subject: [PATCH 3/4] Update FilteredData.R (#81) update the icon to font awesome 6 --- R/FilteredData.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/FilteredData.R b/R/FilteredData.R index ae3a063cc..a71e876f4 100644 --- a/R/FilteredData.R +++ b/R/FilteredData.R @@ -627,7 +627,7 @@ FilteredData <- R6::R6Class( # nolint actionLink( ns("remove_all_filters"), "", - icon("times-circle", lib = "font-awesome"), + icon("circle-xmark", lib = "font-awesome"), title = "Remove active filters", class = "remove_all pull-right" ), From 5047ae8833c69b2f70597bd1c6967fea40c6fa6e Mon Sep 17 00:00:00 2001 From: Polkas Date: Tue, 26 Jul 2022 09:24:42 +0000 Subject: [PATCH 4/4] [skip actions] Bump version to 0.1.1.9011 --- DESCRIPTION | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index ebc5fdb75..363444b41 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: teal.slice Title: Filter module for teal applications -Version: 0.1.1.9010 +Version: 0.1.1.9011 Date: 2022-06-09 Authors@R: c( person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")), diff --git a/NEWS.md b/NEWS.md index 5ea67157b..e1c9c5579 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# teal.slice 0.1.1.9010 +# teal.slice 0.1.1.9011 * Removed `CDISCFilteredDataset` class and functionality moved to `CDISCFilteredData`. * Changed constructor of `FilteredData` to not require `TealData` object. See `help(init_filtered_data)` for more details.