Merge branch 'main' into teal_reportable

Signed-off-by: Marcin <[email protected]>

Author: m7pr

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ default_language_version:
   python: python3
 repos:
   - repo: https://github.com/lorenzwalthert/precommit
-    rev: v0.4.3.9011
+    rev: v0.4.3.9012
     hooks:
       - id: style-files
         name: Style code with `styler`

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: teal.modules.general
 Title: General Modules for 'teal' Applications
-Version: 0.4.1.9005
-Date: 2025-06-23
+Version: 0.4.1.9006
+Date: 2025-07-08
 Authors@R: c(
     person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre")),
     person("Pawel", "Rucki", , "[email protected]", role = "aut"),

NEWS.md

@@ -1,10 +1,13 @@
-# teal.modules.general 0.4.1.9005
+# teal.modules.general 0.4.1.9006
 
 # teal.modules.general 0.4.1
 
 ### Bug fixes
 * Fixes output is not updated when filter is added for the modules:  `tm_a_pca`, `tm_a_regression`, `tm_g_scatterplot`, `tm_g_association`, `tm_g_bivariate`, `tm_g_distribution`, `tm_g_response`, `tm_t_crosstable` (#870)
 
+### Enhancements
+* Added `remove_zero_columns` to `tm_t_crosstable` to add an option to remove empty columns (#890)
+
 # teal.modules.general 0.4.0
 
 ### Enhancements

R/tm_t_crosstable.R

@@ -19,12 +19,23 @@
 #' @param show_total (`logical(1)`)
 #' Indicates whether to show total column.
 #' Defaults to `TRUE`.
+#' @param remove_zero_columns (`logical(1)`)
+#' Indicates whether to remove columns that contain only zeros from the output table.
+#' Defaults to `FALSE`.
 #'
 #' @note For more examples, please see the vignette "Using cross table" via
 #' `vignette("using-cross-table", package = "teal.modules.general")`.
 #'
 #' @inherit shared_params return
 #'
+#' @section Table Settings:
+#' The module provides several table settings that can be adjusted:
+#' \itemize{
+#'   \item \code{Show column percentage}: Shows column percentages when enabled
+#'   \item \code{Show total column}: Shows a total column when enabled
+#'   \item \code{Remove zero-only columns}: Removes columns that contain only zeros from the output table
+#' }
+#'
 #' @section Decorating Module:
 #'
 #' This module generates the following objects, which can be modified in place using decorators:
@@ -157,6 +168,7 @@ tm_t_crosstable <- function(label = "Cross Table",
                             y,
                             show_percentage = TRUE,
                             show_total = TRUE,
+                            remove_zero_columns = FALSE,
                             pre_output = NULL,
                             post_output = NULL,
                             basic_table_args = teal.widgets::basic_table_args(),
@@ -177,6 +189,7 @@ tm_t_crosstable <- function(label = "Cross Table",
 
   checkmate::assert_flag(show_percentage)
   checkmate::assert_flag(show_total)
+  checkmate::assert_flag(remove_zero_columns)
   checkmate::assert_multi_class(pre_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
   checkmate::assert_multi_class(post_output, c("shiny.tag", "shiny.tag.list", "html"), null.ok = TRUE)
   checkmate::assert_class(basic_table_args, classes = "basic_table_args")
@@ -191,6 +204,7 @@ tm_t_crosstable <- function(label = "Cross Table",
     label = label,
     x = x,
     y = y,
+    remove_zero_columns = remove_zero_columns,
     basic_table_args = basic_table_args,
     decorators = decorators
   )
@@ -209,7 +223,7 @@ tm_t_crosstable <- function(label = "Cross Table",
 }
 
 # UI function for the cross-table module
-ui_t_crosstable <- function(id, x, y, show_percentage, show_total, pre_output, post_output, ...) {
+ui_t_crosstable <- function(id, x, y, show_percentage, show_total, remove_zero_columns, pre_output, post_output, ...) {
   args <- list(...)
   ns <- NS(id)
   is_single_dataset <- teal.transform::is_single_dataset(x, y)
@@ -244,7 +258,8 @@ ui_t_crosstable <- function(id, x, y, show_percentage, show_total, pre_output, p
         bslib::accordion_panel(
           title = "Table settings",
           checkboxInput(ns("show_percentage"), "Show column percentage", value = show_percentage),
-          checkboxInput(ns("show_total"), "Show total column", value = show_total)
+          checkboxInput(ns("show_total"), "Show total column", value = show_total),
+          checkboxInput(ns("remove_zero_columns"), "Remove zero-only columns", value = remove_zero_columns)
         )
       ),
       ui_decorate_teal_data(ns("decorator"), decorators = select_decorators(args$decorators, "table"))
@@ -258,7 +273,7 @@ ui_t_crosstable <- function(id, x, y, show_percentage, show_total, pre_output, p
 }
 
 # Server function for the cross-table module
-srv_t_crosstable <- function(id, data, label, x, y, basic_table_args, decorators) {
+srv_t_crosstable <- function(id, data, label, x, y, remove_zero_columns, basic_table_args, decorators) {
   checkmate::assert_class(data, "reactive")
   checkmate::assert_class(isolate(data()), "teal_data")
   moduleServer(id, function(input, output, session) {
@@ -352,6 +367,7 @@ srv_t_crosstable <- function(id, data, label, x, y, basic_table_args, decorators
 
       show_percentage <- input$show_percentage
       show_total <- input$show_total
+      remove_zero_columns <- input$remove_zero_columns
 
       plot_title <- paste(
         "Cross-Table of",
@@ -415,14 +431,32 @@ srv_t_crosstable <- function(id, data, label, x, y, basic_table_args, decorators
           )
         ) %>%
         teal.code::eval_code(
-          substitute(
-            expr = {
-              ANL <- tern::df_explicit_na(ANL)
-              table <- rtables::build_table(lyt = table, df = ANL[order(ANL[[y_name]]), ])
-            },
-            env = list(y_name = y_name)
-          )
+          expression(ANL <- tern::df_explicit_na(ANL))
         )
+
+      if (remove_zero_columns) {
+        obj <- obj %>%
+          teal.code::eval_code(
+            substitute(
+              expr = {
+                ANL[[y_name]] <- droplevels(ANL[[y_name]])
+                table <- rtables::build_table(lyt = table, df = ANL[order(ANL[[y_name]]), ])
+              },
+              env = list(y_name = y_name)
+            )
+          )
+      } else {
+        obj <- obj %>%
+          teal.code::eval_code(
+            substitute(
+              expr = {
+                table <- rtables::build_table(lyt = table, df = ANL[order(ANL[[y_name]]), ])
+              },
+              env = list(y_name = y_name)
+            )
+          )
+      }
+      obj
     })
 
     decorated_output_q <- srv_decorate_teal_data(