diff --git a/NAMESPACE b/NAMESPACE index d02e28a6..6ebc8c7c 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -5,7 +5,6 @@ S3method(print,ga_custom_data_source_upload) S3method(print,ga_custom_datasource) S3method(print,ga_model) S3method(print,ga_model_result) -export("%>%") export(authDropdown) export(authDropdownUI) export(dim_filter) @@ -159,4 +158,5 @@ importFrom(tidyr,unnest) importFrom(tidyr,unnest_longer) importFrom(tidyr,unnest_wider) importFrom(tools,file_ext) +importFrom(utils,menu) importFrom(utils,write.csv) diff --git a/R/ga_v4_get.R b/R/ga_v4_get.R index 3a5714af..92d1ca8a 100644 --- a/R/ga_v4_get.R +++ b/R/ga_v4_get.R @@ -242,9 +242,8 @@ make_ga_4_req <- function(viewId, #' By default local caching is turned on for v4 API requests. This means that #' making the same request as one this session will read from memory and not #' make an API call. You can also set the cache to disk via -#' the \link[googleAuthR]{gar_cache_setup} function. This can be useful -#' when running RMarkdown reports using data. To empty the cache use -#' \link[googleAuthR]{gar_cache_empty}. +#' the \link{ga_cache_call} function. This can be useful +#' when running RMarkdown reports using data. #' #' @inheritParams make_ga_4_req #' @param max Maximum number of rows to fetch. Defaults at 1000. Use -1 to fetch all results. Ignored when \code{anti_sample=TRUE}. diff --git a/R/models.R b/R/models.R index b64d82ba..6d1e7258 100644 --- a/R/models.R +++ b/R/models.R @@ -400,7 +400,7 @@ eval_input_list <- function(dots){ #' Upload an interactive visualisation so it can be embedded in a tweet #' -#' Inspired by \url{https://datatitian.com/how-to-turn-your-ggplot2-visualization-into-an-interactive-tweet/} this uploads your model output into Google Cloud storage, in the right format to embed in a tweet +#' Inspired by \code{https://datatitian.com/how-to-turn-your-ggplot2-visualization-into-an-interactive-tweet/} this uploads your model output into Google Cloud storage, in the right format to embed in a tweet #' #' @param model_output A \code{ga_model_result} object created by \link{ga_model} #' @param twitter Your twitter handle e.g. \code{@holomarked} diff --git a/R/setup_service.R b/R/setup_service.R index acb5351a..5840ddaf 100644 --- a/R/setup_service.R +++ b/R/setup_service.R @@ -55,9 +55,11 @@ ga_auth_setup <- function(){ return(invisible("")) } +#' @noRd +#' @importFrom utils menu add_service_email <- function(){ - which_email <- utils::menu(title = "Which email do you want to add permissions for?", + which_email <- menu(title = "Which email do you want to add permissions for?", choices = c("The service email from GA_AUTH_FILE", "Another email")) if(which_email == 0){ diff --git a/R/users.R b/R/users.R index bf54629c..ca99825d 100644 --- a/R/users.R +++ b/R/users.R @@ -365,7 +365,7 @@ ga_users_add <- function(email, #' #' @param linkId The linkId to update #' @inheritParams ga_users_list -#' @param update_object A list that will be turned into JSON via \link[jsonlite]{toJSON} that represents the new configuration for this linkId +#' @param update_object A list that will be turned into JSON that represents the new configuration for this linkId #' #' #' @return The new user object that has been altered. diff --git a/R/utilities.R b/R/utilities.R index e378423e..7d9f990a 100644 --- a/R/utilities.R +++ b/R/utilities.R @@ -253,12 +253,6 @@ expect_null_or_s3_class <- function(thing, s3class){ } } - -#' @importFrom magrittr %>% -#' @export -#' @keywords internal -magrittr::`%>%` - #' A helper function that tests whether an object is either NULL _or_ #' a list of NULLs #' diff --git a/man/ga_model_tweet.Rd b/man/ga_model_tweet.Rd index 2d0b1b70..5cd4fc53 100644 --- a/man/ga_model_tweet.Rd +++ b/man/ga_model_tweet.Rd @@ -18,7 +18,7 @@ ga_model_tweet(model_output, twitter, title, bucket, image = "") \item{image}{An optional image to display before the visualition runs} } \description{ -Inspired by \url{https://datatitian.com/how-to-turn-your-ggplot2-visualization-into-an-interactive-tweet/} this uploads your model output into Google Cloud storage, in the right format to embed in a tweet +Inspired by \code{https://datatitian.com/how-to-turn-your-ggplot2-visualization-into-an-interactive-tweet/} this uploads your model output into Google Cloud storage, in the right format to embed in a tweet } \details{ This should work with all model outputs that are using \code{library(htmlwidgets)} diff --git a/man/ga_users_update.Rd b/man/ga_users_update.Rd index f072be07..0869d111 100644 --- a/man/ga_users_update.Rd +++ b/man/ga_users_update.Rd @@ -15,7 +15,7 @@ ga_users_update( \arguments{ \item{linkId}{The linkId to update} -\item{update_object}{A list that will be turned into JSON via \link[jsonlite]{toJSON} that represents the new configuration for this linkId} +\item{update_object}{A list that will be turned into JSON that represents the new configuration for this linkId} \item{accountId}{Account Id} diff --git a/man/google_analytics.Rd b/man/google_analytics.Rd index 950c22a8..2c8fec44 100644 --- a/man/google_analytics.Rd +++ b/man/google_analytics.Rd @@ -118,9 +118,8 @@ If you are on GA360 and have access to resource quotas, By default local caching is turned on for v4 API requests. This means that making the same request as one this session will read from memory and not make an API call. You can also set the cache to disk via - the \link[googleAuthR]{gar_cache_setup} function. This can be useful - when running RMarkdown reports using data. To empty the cache use - \link[googleAuthR]{gar_cache_empty}. + the \link{ga_cache_call} function. This can be useful + when running RMarkdown reports using data. } \examples{ diff --git a/man/reexports.Rd b/man/reexports.Rd deleted file mode 100644 index 0e3d7da0..00000000 --- a/man/reexports.Rd +++ /dev/null @@ -1,16 +0,0 @@ -% Generated by roxygen2: do not edit by hand -% Please edit documentation in R/utilities.R -\docType{import} -\name{reexports} -\alias{reexports} -\alias{\%>\%} -\title{Objects exported from other packages} -\keyword{internal} -\description{ -These objects are imported from other packages. Follow the links -below to see their documentation. - -\describe{ - \item{magrittr}{\code{\link[magrittr]{\%>\%}}} -}} -