From 26614998e5fdfc9df4d7b6d975be8ff95126763a Mon Sep 17 00:00:00 2001
From: Emily de la Rua <emily.de_la_rua@contractors.roche.com>
Date: Thu, 7 Sep 2023 15:55:01 -0400
Subject: [PATCH] Refactor tabulate_rsp_subgroups to pass sanitation checks

---
 NEWS.md                |  2 ++
 R/response_subgroups.R | 40 ++++++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index c7d254e9fe..1a66dafbc7 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,6 @@
 # tern 0.9.0.9000
+### Enhancements
+* Refactored `tabulate_rsp_subgroups` to pass sanitation checks by preventing creation of degenerate subtables.
 
 # tern 0.9.0
 ### New Features
diff --git a/R/response_subgroups.R b/R/response_subgroups.R
index c84ca1bcf8..e89ec59c8a 100644
--- a/R/response_subgroups.R
+++ b/R/response_subgroups.R
@@ -228,21 +228,23 @@ tabulate_rsp_subgroups <- function(lyt,
   # Columns from table_prop are optional.
   if (length(colvars_prop$vars) > 0) {
     lyt_prop <- split_cols_by(lyt = lyt, var = "arm")
+    lyt_prop <- split_cols_by_multivar(
+      lyt = lyt_prop,
+      vars = colvars_prop$vars,
+      varlabels = colvars_prop$labels
+    )
+
+    # "All Patients" row
     lyt_prop <- split_rows_by(
       lyt = lyt_prop,
       var = "row_type",
       split_fun = keep_split_levels("content"),
-      nested = FALSE
-    )
-    lyt_prop <- summarize_row_groups(
-      lyt = lyt_prop,
-      var = "var_label",
-      cfun = afun_lst[names(colvars_prop$labels)]
+      nested = FALSE,
+      child_labels = "hidden"
     )
-    lyt_prop <- split_cols_by_multivar(
+    lyt_prop <- analyze_colvars(
       lyt = lyt_prop,
-      vars = colvars_prop$vars,
-      varlabels = colvars_prop$labels
+      afun = afun_lst[names(colvars_prop$labels)]
     )
 
     if ("analysis" %in% df$prop$row_type) {
@@ -268,21 +270,23 @@ tabulate_rsp_subgroups <- function(lyt,
 
   # Columns "n_tot", "or", "ci" in table_or are required.
   lyt_or <- split_cols_by(lyt = lyt, var = "arm")
-  lyt_or <- split_rows_by(
-    lyt = lyt_or,
-    var = "row_type",
-    split_fun = keep_split_levels("content"),
-    nested = FALSE
-  )
   lyt_or <- split_cols_by_multivar(
     lyt = lyt_or,
     vars = colvars_or$vars,
     varlabels = colvars_or$labels
   )
-  lyt_or <- summarize_row_groups(
+
+  # "All Patients" row
+  lyt_or <- split_rows_by(
+    lyt = lyt_or,
+    var = "row_type",
+    split_fun = keep_split_levels("content"),
+    nested = FALSE,
+    child_labels = "hidden"
+  )
+  lyt_or <- analyze_colvars(
     lyt = lyt_or,
-    var = "var_label",
-    cfun = afun_lst[names(colvars_or$labels)]
+    afun = afun_lst[names(colvars_or$labels)]
   ) %>%
     append_topleft("Baseline Risk Factors")