chore: using the proper join_keys subset

Not needed for getters but it's nice to use the same getters too
insightsengineering · Nov 17, 2023 · d754da3 · d754da3
1 parent e697644
commit d754da3
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 15 deletions.
diff --git a/R/tm_outliers.R b/R/tm_outliers.R
@@ -476,7 +476,7 @@ srv_outliers <- function(id, data, reporter, filter_panel_api, outlier_var,
           },
           env = list(
             dataname = as.name(dataname_first),
-            join_keys = as.character(teal.data::join_keys(data)[[dataname_first]][[dataname_first]])
+            join_keys = as.character(teal.data::join_keys(data)[dataname_first, dataname_first])
           )
         )
       )

diff --git a/R/tm_variable_browser.R b/R/tm_variable_browser.R
@@ -1151,7 +1151,7 @@ render_tab_header <- function(dataset_name, output, data) {
     df <- data[[dataset_name]]()
     join_keys <- join_keys(data)
     if (!is.null(join_keys)) {
-      key <- join_keys(data)[[dataset_name]][[dataset_name]]
+      key <- join_keys(data)[dataset_name, dataset_name]
     } else {
       key <- NULL
     }
@@ -1224,7 +1224,7 @@ render_tab_table <- function(dataset_name, parent_dataname, output, data, input,
 
       join_keys <- join_keys(data)
       if (!is.null(join_keys)) {
-        icons[intersect(join_keys[[dataset_name]][[dataset_name]], colnames(df))] <- "primary_key"
+        icons[intersect(join_keys[dataset_name, dataset_name], colnames(df))] <- "primary_key"
       }
       icons <- variable_type_icons(icons)
 

diff --git a/vignettes/using-association-plot.Rmd b/vignettes/using-association-plot.Rmd
@@ -78,8 +78,12 @@ data <- within(data, {
 })
 datanames <- c("ADSL", "ADSL2", "ADRS", "ADTTE", "ADLB")
 datanames(data) <- datanames
-join_keys(data) <- default_cdisc_join_keys[datanames]
-join_keys(data)[["ADSL2"]][["ADSL2"]] <- c("STUDYID", "USUBJID")
+jk <- default_cdisc_join_keys[datanames]
+jk_adsl2 <- jk
+names(jk_adsl2)[names(jk_adsl2) == "ADSL"] <- "ADSL2"
+jk <- c(jk, jk_adsl2)
+jk["ADSL2", "ADSL"] <- c("USUBJID", "STUDYID")
+
 # nolint end
 
 app <- teal::init(

diff --git a/vignettes/using-bivariate-plot.Rmd b/vignettes/using-bivariate-plot.Rmd
@@ -58,8 +58,11 @@ data <- within(data, {
 })
 datanames <- c("ADSL", "ADSL2", "ADRS", "ADTTE", "ADLB")
 datanames(data) <- datanames
-join_keys(data) <- default_cdisc_join_keys[datanames]
-join_keys(data)[["ADSL2"]][["ADSL2"]] <- c("STUDYID", "USUBJID")
+jk <- default_cdisc_join_keys[datanames]
+jk_adsl2 <- jk
+names(jk_adsl2)[names(jk_adsl2) == "ADSL"] <- "ADSL2"
+jk <- c(jk, jk_adsl2)
+jk["ADSL2", "ADSL"] <- c("USUBJID", "STUDYID")
 # nolint end
 ```
 

diff --git a/vignettes/using-regression-plots.Rmd b/vignettes/using-regression-plots.Rmd
@@ -56,8 +56,11 @@ data <- within(data, {
 })
 datanames <- c("ADSL", "ADSL2", "ADRS", "ADTTE", "ADLB")
 datanames(data) <- datanames
-join_keys(data) <- default_cdisc_join_keys[datanames]
-join_keys(data)[["ADSL2"]][["ADSL2"]] <- c("STUDYID", "USUBJID")
+jk <- default_cdisc_join_keys[datanames]
+jk_adsl2 <- jk
+names(jk_adsl2)[names(jk_adsl2) == "ADSL"] <- "ADSL2"
+jk <- c(jk, jk_adsl2)
+jk["ADSL2", "ADSL"] <- c("USUBJID", "STUDYID")
 # nolint end
 ```
 

diff --git a/vignettes/using-response-plot.Rmd b/vignettes/using-response-plot.Rmd
@@ -55,8 +55,11 @@ data <- within(data, {
 })
 datanames <- c("ADSL", "ADSL2", "ADRS", "ADTTE", "ADLB")
 datanames(data) <- datanames
-join_keys(data) <- default_cdisc_join_keys[datanames]
-join_keys(data)[["ADSL2"]][["ADSL2"]] <- c("STUDYID", "USUBJID")
+jk <- default_cdisc_join_keys[datanames]
+jk_adsl2 <- jk
+names(jk_adsl2)[names(jk_adsl2) == "ADSL"] <- "ADSL2"
+jk <- c(jk, jk_adsl2)
+jk["ADSL2", "ADSL"] <- c("USUBJID", "STUDYID")
 # nolint end
 ```
 

diff --git a/vignettes/using-scatterplot-matrix.Rmd b/vignettes/using-scatterplot-matrix.Rmd
@@ -56,8 +56,11 @@ data <- within(data, {
 })
 datanames <- c("ADSL", "ADSL2", "ADRS", "ADTTE", "ADLB")
 datanames(data) <- datanames
-join_keys(data) <- default_cdisc_join_keys[datanames]
-join_keys(data)[["ADSL2"]][["ADSL2"]] <- c("STUDYID", "USUBJID")
+jk <- default_cdisc_join_keys[datanames]
+jk_adsl2 <- jk
+names(jk_adsl2)[names(jk_adsl2) == "ADSL"] <- "ADSL2"
+jk <- c(jk, jk_adsl2)
+jk["ADSL2", "ADSL"] <- c("USUBJID", "STUDYID")
 # nolint end
 ```
 

diff --git a/vignettes/using-scatterplot.Rmd b/vignettes/using-scatterplot.Rmd
@@ -56,8 +56,11 @@ data <- within(data, {
 })
 datanames <- c("ADSL", "ADSL2", "ADRS", "ADTTE", "ADLB")
 datanames(data) <- datanames
-join_keys(data) <- default_cdisc_join_keys[datanames]
-join_keys(data)[["ADSL2"]][["ADSL2"]] <- c("STUDYID", "USUBJID")
+jk <- default_cdisc_join_keys[datanames]
+jk_adsl2 <- jk
+names(jk_adsl2)[names(jk_adsl2) == "ADSL"] <- "ADSL2"
+jk <- c(jk, jk_adsl2)
+jk["ADSL2", "ADSL"] <- c("USUBJID", "STUDYID")
 # nolint end
 ```