diff --git a/R/atlas_counts.R b/R/atlas_counts.R index 85809d21..6c5cfe4a 100644 --- a/R/atlas_counts.R +++ b/R/atlas_counts.R @@ -170,16 +170,6 @@ atlas_counts_internal <- function(identify = NULL, verbose <- getOption("galah_config")$verbose - # if `group_by` is as a vector - if(!is.null(group_by)){ - if(!inherits(group_by, "galah_group_by")){ - group_by <- galah_group_by(group_by) - } - if(nrow(group_by) < 1){ - group_by <- NULL - } - } - # ensure profile works from galah_filter as well as galah_profile if(inherits(data_profile, "galah_data_profile")){ profile <- data_profile diff --git a/R/galah_call.R b/R/galah_call.R index f84d52b0..66eff2a3 100644 --- a/R/galah_call.R +++ b/R/galah_call.R @@ -79,7 +79,7 @@ galah_call <- function(identify = NULL, check_call_args(select, "select") check_call_args(geolocate, "geolocate") check_call_args(group_by, "group_by") - check_call_args(group_by, "data_profile") + check_call_args(data_profile, "data_profile") check_call_args(down_to, "down_to") request <- structure(c(list(identify = identify, diff --git a/R/galah_group_by.R b/R/galah_group_by.R index 8bbc44c6..ee898546 100644 --- a/R/galah_group_by.R +++ b/R/galah_group_by.R @@ -80,10 +80,9 @@ galah_group_by <- function(..., expand = TRUE){ provided_variables <- dequote(unlist(lapply(dots, as_label))) if (getOption("galah_config")$run_checks){ validate_fields(provided_variables) - }else{ - available_variables <- provided_variables[ - provided_variables %in% show_all_fields()$id] } + available_variables <- provided_variables[ + provided_variables %in% show_all_fields()$id] if(length(available_variables) > 0){ df <- tibble(name = available_variables) df$type <- ifelse(str_detect(df$name, "[[:lower:]]"), "field", "assertions")