Merge branch 'main' into 76_remove_filtered@main

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.9011
 Date: 2022-06-09
 Authors@R: c(
     person("Dawid", "Kaledkowski", , "dawid.kaledkowski@roche.com", role = c("aut", "cre")),

NEWS.md

@@ -1,4 +1,4 @@
-# teal.slice 0.1.1.9009
+# 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.

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"
                       )
                     )

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"))
               )
             )
           ),
@@ -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"
               ),
@@ -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"))
               )
             )
           ),

R/FilteredDataset.R

@@ -339,7 +339,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"
               )
             )