Update check as-cran and default landing page

.github/workflows/check.yaml

@@ -25,6 +25,8 @@ jobs:
     secrets:
       REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
     with:
+      additional-env-vars: |
+        _R_CHECK_CRAN_INCOMING_REMOTE_=false
       additional-r-cmd-check-params: --as-cran
   coverage:
     name: Coverage 📔

.github/workflows/docs.yaml

@@ -39,3 +39,5 @@ jobs:
     uses: insightsengineering/r.pkg.template/.github/workflows/pkgdown.yaml@main
     secrets:
       REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
+    with:
+      default-landing-page: latest-tag

.github/workflows/release.yaml

@@ -23,6 +23,8 @@ jobs:
     uses: insightsengineering/r.pkg.template/.github/workflows/pkgdown.yaml@main
     secrets:
       REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
+    with:
+      default-landing-page: latest-tag
   validation:
     name: R Package Validation report 📃
     needs: release

DESCRIPTION

@@ -29,6 +29,7 @@ Imports:
     grid,
     gridExtra,
     gtable,
+    methods,
     rlang,
     stats,
     stringr,

NAMESPACE

@@ -19,5 +19,6 @@ export(stream_filter_convwhere)
 export(stream_filter_index)
 import(dplyr)
 import(ggplot2)
+importFrom(methods,is)
 importFrom(rlang,":=")
 importFrom(rlang,.data)

R/osprey.R

@@ -4,6 +4,7 @@
 #'
 #' @import dplyr ggplot2
 #' @importFrom rlang .data :=
+#' @importFrom methods is
 #' @docType package
 #' @name osprey
 #' @keywords internal

R/stream_filter.R

@@ -34,7 +34,7 @@
 stream_filter <- function(slref = NULL, anl = NULL, filters, suffix, slref_keep = NULL, usubjid = "USUBJID") {
   actual_suffix <- NULL
 
-  if (is.null(anl) & is.null(slref)) {
+  if (is.null(anl) && is.null(slref)) {
     stop("At least one of anl= or slref= must be provided")
   }
 
@@ -96,7 +96,7 @@ stream_filter <- function(slref = NULL, anl = NULL, filters, suffix, slref_keep
       silent = TRUE
     )
 
-    if ("try-error" %in% class(new_df)) {
+    if (is(new_df, "try-error")) {
       # failed - retain original dataset
       warning(paste("\nFilter ID=", this_filter, "was NOT applied.", msg1, "\n Error message:", new_df))
       cat(paste("\nFilter ID=", this_filter, "was NOT applied.", msg1, "\n Error message:", new_df))
@@ -192,8 +192,6 @@ stream_filter_index <- function(string1, string2) {
 #' stream_filter_convwhere(x = "where X in (1 2 3 4) and Y gt 4 ")
 #' stream_filter_convwhere(x = "where X = \"fred\" and Y gt 4 ")
 stream_filter_convwhere <- function(x) {
-
-
   # convert double quotes to single quotes. May fail if quoted values exist.
   this_rclause <- gsub("\"", "'", x, fixed = TRUE)
 
@@ -205,7 +203,6 @@ stream_filter_convwhere <- function(x) {
   inquotes <- rep(c(0, 1), length.out = length(this_rclause_quotes))
 
   for (j in seq_along(inquotes)) {
-
     # try and convert logic outside quotes
     if (inquotes[j] == 0) {
       this_rclause_quotes[j] <- toupper(this_rclause_quotes[j])
@@ -231,7 +228,6 @@ stream_filter_convwhere <- function(x) {
 
   # if contains an in  statement need to ensure commas exist
   if (grepl(" %in% c", this_rclause, fixed = TRUE)) {
-
     # get the clause (assume only 1 per filter...)
     temp1_str <- strsplit(this_rclause, split = " %in% c(", fixed = TRUE) %>%
       unlist()

R/utils.R

@@ -167,7 +167,7 @@ grobs2pdf <- function(grobs,
   logtext <- paste(mget(ls(pattern = "log")), collapse = "\n")
 
   ## Make the grobs
-  if (class(grobs) != "list") {
+  if (!is.list(grobs)) {
     grobs <- list(grobs)
   }
 
@@ -176,7 +176,6 @@ grobs2pdf <- function(grobs,
     grobs = grobs,
     titles = titles,
     footnotes = paste(footnotes, logtext, sep = "\n\n"),
-    # outer_margins = grid::unit(c(bottom.margin, left.margin, top.margin, right.margin), "inches"),
     outer_margins = grid::unit(c(0, 0, 0, 0), "lines"),
     padding = grid::unit(0.5, "lines"),
     gp_titles = grid::gpar(fontsize = fontsize + 1, fontface = 2, lineheight = 1),
@@ -336,9 +335,9 @@ grob_part <- function(gplot_grob, part) {
 grob_parts <- function(gplot, parts) {
   stopifnot("gplot must inherit from class 'ggplot' or 'grob'" = inherits(gplot, c("ggplot", "grob")))
 
-  if ("ggplot" %in% class(gplot)) {
+  if (is(gplot, "ggplot")) {
     gplot_grob <- ggplotGrob(gplot)
-  } else if ("grob" %in% class(gplot)) {
+  } else if (is(gplot, "grob")) {
     gplot_grob <- gplot
   }
   ret <- lapply(parts, grob_part, gplot = gplot_grob)